diff --git a/app/src/pages/MapContainer.tsx b/app/src/pages/MapContainer.tsx
index b6b454cb..a49be37f 100644
--- a/app/src/pages/MapContainer.tsx
+++ b/app/src/pages/MapContainer.tsx
@@ -86,6 +86,7 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
         expandLayerControl={map.expand_layer_control}
         tileServerUrl={map.tile_server_url}
         tileServerAttribution={map.tile_server_attribution}
+        showFullscreenControl={map.show_fullscreen_control}
       >
         {layers &&
           apis &&
diff --git a/backend/directus-config/development/snapshot/fields/maps/Controls.json b/backend/directus-config/development/snapshot/fields/maps/Controls.json
index b0984f2e..a6314316 100644
--- a/backend/directus-config/development/snapshot/fields/maps/Controls.json
+++ b/backend/directus-config/development/snapshot/fields/maps/Controls.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 12,
+    "sort": 11,
     "special": [
       "alias",
       "no-data",
diff --git a/backend/directus-config/development/snapshot/fields/maps/Presets.json b/backend/directus-config/development/snapshot/fields/maps/Presets.json
index 53be852b..8a4afd70 100644
--- a/backend/directus-config/development/snapshot/fields/maps/Presets.json
+++ b/backend/directus-config/development/snapshot/fields/maps/Presets.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 15,
+    "sort": 14,
     "special": [
       "alias",
       "no-data",
diff --git a/backend/directus-config/development/snapshot/fields/maps/custom_text.json b/backend/directus-config/development/snapshot/fields/maps/custom_text.json
index 201a5402..350815b0 100644
--- a/backend/directus-config/development/snapshot/fields/maps/custom_text.json
+++ b/backend/directus-config/development/snapshot/fields/maps/custom_text.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 13,
+    "sort": 12,
     "special": null,
     "translations": null,
     "validation": null,
diff --git a/backend/directus-config/development/snapshot/fields/maps/default_theme.json b/backend/directus-config/development/snapshot/fields/maps/default_theme.json
index 2058819e..056b17b8 100644
--- a/backend/directus-config/development/snapshot/fields/maps/default_theme.json
+++ b/backend/directus-config/development/snapshot/fields/maps/default_theme.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 10,
+    "sort": 9,
     "special": [
       "m2o"
     ],
diff --git a/backend/directus-config/development/snapshot/fields/maps/donation_widget.json b/backend/directus-config/development/snapshot/fields/maps/donation_widget.json
index 816de3c9..bba60fb7 100644
--- a/backend/directus-config/development/snapshot/fields/maps/donation_widget.json
+++ b/backend/directus-config/development/snapshot/fields/maps/donation_widget.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 11,
+    "sort": 10,
     "special": [
       "cast-boolean"
     ],
diff --git a/backend/directus-config/development/snapshot/fields/maps/geo.json b/backend/directus-config/development/snapshot/fields/maps/geo.json
index 05b3a9b3..6fec38e5 100644
--- a/backend/directus-config/development/snapshot/fields/maps/geo.json
+++ b/backend/directus-config/development/snapshot/fields/maps/geo.json
@@ -26,7 +26,7 @@
     },
     "readonly": false,
     "required": false,
-    "sort": 14,
+    "sort": 13,
     "special": [
       "cast-json"
     ],
diff --git a/backend/directus-config/development/snapshot/fields/maps/hide_signup.json b/backend/directus-config/development/snapshot/fields/maps/hide_signup.json
index 0656ea6c..9f51e442 100644
--- a/backend/directus-config/development/snapshot/fields/maps/hide_signup.json
+++ b/backend/directus-config/development/snapshot/fields/maps/hide_signup.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 17,
+    "sort": 16,
     "special": [
       "cast-boolean"
     ],
diff --git a/backend/directus-config/development/snapshot/fields/maps/show_fullscreen_control.json b/backend/directus-config/development/snapshot/fields/maps/show_fullscreen_control.json
new file mode 100644
index 00000000..10b30c6a
--- /dev/null
+++ b/backend/directus-config/development/snapshot/fields/maps/show_fullscreen_control.json
@@ -0,0 +1,45 @@
+{
+  "collection": "maps",
+  "field": "show_fullscreen_control",
+  "type": "boolean",
+  "meta": {
+    "collection": "maps",
+    "conditions": null,
+    "display": null,
+    "display_options": null,
+    "field": "show_fullscreen_control",
+    "group": "Controls",
+    "hidden": false,
+    "interface": "boolean",
+    "note": null,
+    "options": null,
+    "readonly": false,
+    "required": false,
+    "sort": 6,
+    "special": [
+      "cast-boolean"
+    ],
+    "translations": null,
+    "validation": null,
+    "validation_message": null,
+    "width": "half"
+  },
+  "schema": {
+    "name": "show_fullscreen_control",
+    "table": "maps",
+    "data_type": "boolean",
+    "default_value": false,
+    "max_length": null,
+    "numeric_precision": null,
+    "numeric_scale": null,
+    "is_nullable": true,
+    "is_unique": false,
+    "is_indexed": false,
+    "is_primary_key": false,
+    "is_generated": false,
+    "generation_expression": null,
+    "has_auto_increment": false,
+    "foreign_key_table": null,
+    "foreign_key_column": null
+  }
+}
diff --git a/backend/directus-config/development/snapshot/fields/maps/show_request_password.json b/backend/directus-config/development/snapshot/fields/maps/show_request_password.json
index 276a251b..52c04dd4 100644
--- a/backend/directus-config/development/snapshot/fields/maps/show_request_password.json
+++ b/backend/directus-config/development/snapshot/fields/maps/show_request_password.json
@@ -15,7 +15,7 @@
     "options": null,
     "readonly": false,
     "required": false,
-    "sort": 18,
+    "sort": 17,
     "special": [
       "cast-boolean"
     ],
diff --git a/backend/directus-config/development/snapshot/fields/maps/tile_server.json b/backend/directus-config/development/snapshot/fields/maps/tile_server.json
index d88f8ee9..11288234 100644
--- a/backend/directus-config/development/snapshot/fields/maps/tile_server.json
+++ b/backend/directus-config/development/snapshot/fields/maps/tile_server.json
@@ -17,7 +17,7 @@
     },
     "readonly": false,
     "required": false,
-    "sort": 16,
+    "sort": 15,
     "special": [
       "alias",
       "no-data",
diff --git a/lib/src/Components/Map/UtopiaMapInner.tsx b/lib/src/Components/Map/UtopiaMapInner.tsx
index 7cfc5d96..9b102a93 100644
--- a/lib/src/Components/Map/UtopiaMapInner.tsx
+++ b/lib/src/Components/Map/UtopiaMapInner.tsx
@@ -279,10 +279,10 @@ export function UtopiaMapInner({
         <TagsControl />
       </Control>
       <Control position='bottomLeft' zIndex='999' absolute>
+        {showFullscreenControl && <FullscreenControl />}
         {showFilterControl && <FilterControl />}
         {showLayerControl && <LayerControl expandLayerControl={expandLayerControl ?? false} />}
         {showGratitudeControl && <GratitudeControl />}
-        {showFullscreenControl && <FullscreenControl />}
       </Control>
       <TileLayer
         maxZoom={19}