diff --git a/lib/globals.dart b/lib/globals.dart
index 07e961a..3f4d914 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -179,7 +179,8 @@ List<PopupMenuEntry<MoreVertSettings>> buildMoreVertSettings(
         value: MoreVertSettings.createRootUser,
         child: Text(AppLocalizations.of(context)!.createRootUser)));
   }
-  if (path != "/settings") {
+  if (path == null ||
+      (path != "/settings" && !path!.startsWith("/settings/"))) {
     list.add(PopupMenuItem(
         value: MoreVertSettings.settings,
         child: Text(AppLocalizations.of(context)!.settings)));
diff --git a/lib/pages/settings/server.dart b/lib/pages/settings/server.dart
index 4c2e968..c508738 100644
--- a/lib/pages/settings/server.dart
+++ b/lib/pages/settings/server.dart
@@ -129,7 +129,7 @@ class _ServerSettingsPage extends State<ServerSettingsPage>
                 leading: IconButton(
                   icon: const Icon(Icons.arrow_back),
                   onPressed: () {
-                    context.canPop() ? context.pop() : context.go("/");
+                    context.canPop() ? context.pop() : context.go("/settings");
                   },
                 ),
                 title: Text(i18n.server),
diff --git a/lib/pages/settings/server_url.dart b/lib/pages/settings/server_url.dart
index 3b835df..41a8243 100644
--- a/lib/pages/settings/server_url.dart
+++ b/lib/pages/settings/server_url.dart
@@ -87,7 +87,7 @@ class _ServerUrlSettingsPage extends State<ServerUrlSettingsPage>
             ? IconButton(
                 icon: const Icon(Icons.arrow_back),
                 onPressed: () {
-                  context.canPop() ? context.pop() : context.go("/");
+                  context.canPop() ? context.pop() : context.go("/settings");
                 },
               )
             : null,