diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
index f50ee015..1af03dcc 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
@@ -384,7 +384,7 @@ class NavigationActivity : AppCompatActivity() {
                 .setNegativeButton(R.string.main_welcome_cancel) { dialog, _ ->
                     // Go to the settings screen
                     dialog.dismiss()
-                    findNavController(R.id.nav_host_fragment).navigate(R.id.settingsFragment)
+                    findNavController(R.id.nav_host_fragment).navigate(R.id.serverSelectorFragment)
                 }
                 .setPositiveButton(R.string.common_ok) { dialog, _ ->
                     // Add the demo server
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt
index 38f42bb1..a95838cd 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt
@@ -9,7 +9,6 @@ import android.widget.Button
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.switchmaterial.SwitchMaterial
 import com.google.android.material.textfield.TextInputLayout
@@ -111,7 +110,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
             val serverSetting = serverSettingsModel.getServerSetting(index)
             serverSetting.observe(
                 viewLifecycleOwner,
-                Observer { t ->
+                { t ->
                     if (t != null) {
                         currentServerSetting = t
                         if (!isInstanceStateSaved) setFields()
@@ -147,6 +146,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
         } else {
             // Creating a new server
             FragmentTitle.setTitle(this, R.string.server_editor_new_label)
+            updateColor(null)
             currentServerSetting = ServerSetting()
             saveButton!!.setOnClickListener {
                 if (getFields()) {
@@ -167,7 +167,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
             bubbleFlag.flagMode = FlagMode.LAST
             ColorPickerDialog.Builder(context).apply {
                 this.colorPickerView.setInitialColor(currentColor)
-                this.colorPickerView.setFlagView(bubbleFlag)
+                this.colorPickerView.flagView = bubbleFlag
             }
                 .attachAlphaSlideBar(false)
                 .setPositiveButton(
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSelectorFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSelectorFragment.kt
index 9d66f6ef..05d7b568 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSelectorFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSelectorFragment.kt
@@ -88,7 +88,7 @@ class ServerSelectorFragment : Fragment() {
                 editServer(position + 1)
             } else {
                 setActiveServer(position)
-                findNavController().navigateUp()
+                findNavController().popBackStack(R.id.mainFragment, false)
             }
         }
 
diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index 9bcf4a28..262b8d78 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -108,7 +108,7 @@
     <string name="main.genres_title">Genres</string>
     <string name="main.music">Music</string>
     <string name="main.offline">Offline</string>
-    <string name="main.setup_server">%s - Setup Server</string>
+    <string name="main.setup_server">%s - Set up Server</string>
     <string name="main.shuffle">Shuffle Play</string>
     <string name="main.songs_random">Random</string>
     <string name="main.songs_starred">Starred</string>