diff --git a/src/assets/DefaultUserSettings.json b/src/assets/DefaultUserSettings.json
index ec71817d..3bb8c8db 100644
--- a/src/assets/DefaultUserSettings.json
+++ b/src/assets/DefaultUserSettings.json
@@ -23,13 +23,6 @@
     "value": true,
     "group": "Datum"
   },
-  {
-    "id": "ui.map.showLocationNames",
-    "type": "boolean",
-    "label": "Show location names",
-    "value": true,
-    "group": "UI"
-  },
   {
     "id": "ui.theme",
     "type": "oneOfMultiple",
@@ -52,45 +45,52 @@
     "group": "UI"
   },
   {
-    "id": "ui.map.theme",
+    "id": "ui.hierarchical-menu-style",
     "type": "oneOfMultiple",
-    "label": "Basemap",
-    "value": "carto-db-automatic",
+    "label": "Menu style",
+    "value": "auto",
     "items": [
       {
-        "value": "carto-db-automatic",
-        "icon": "mdi-theme-light-dark"
+        "value": "auto",
+        "icon": "mdi-responsive"
       },
       {
-        "value": "carto-db-light",
-        "icon": "mdi-weather-sunny"
+        "value": "tree",
+        "icon": "mdi-file-tree"
       },
       {
-        "value": "carto-dark-matter",
-        "icon": "mdi-weather-night"
+        "value": "column",
+        "icon": "mdi-view-week"
       }
     ],
     "group": "UI"
   },
   {
-    "id": "ui.hierarchical-menu-style",
+    "id": "ui.map.theme",
     "type": "oneOfMultiple",
-    "label": "Menu style",
-    "value": "auto",
+    "label": "Basemap",
+    "value": "carto-db-automatic",
     "items": [
       {
-        "value": "auto",
-        "icon": "mdi-responsive"
+        "value": "carto-db-automatic",
+        "icon": "mdi-theme-light-dark"
       },
       {
-        "value": "tree",
-        "icon": "mdi-file-tree"
+        "value": "carto-db-light",
+        "icon": "mdi-weather-sunny"
       },
       {
-        "value": "column",
-        "icon": "mdi-view-week"
+        "value": "carto-dark-matter",
+        "icon": "mdi-weather-night"
       }
     ],
-    "group": "UI"
+    "group": "Map"
+  },
+  {
+    "id": "ui.map.showLocationNames",
+    "type": "boolean",
+    "label": "Show location names",
+    "value": true,
+    "group": "Map"
   }
 ]
diff --git a/src/stores/userSettings.ts b/src/stores/userSettings.ts
index 39cd7506..c33aa4e1 100644
--- a/src/stores/userSettings.ts
+++ b/src/stores/userSettings.ts
@@ -52,7 +52,7 @@ const parameterGroupKey = 'units.parameterGroup.'
 export const useUserSettingsStore = defineStore({
   id: 'userSettings',
   state: (): UserSettingsState => ({
-    groups: ['Units', 'Datum', 'UI'],
+    groups: ['Units', 'Datum', 'UI', 'Map'],
     items: defaultUserSettings,
     convertDatum: false,
     useDisplayUnits: true,