diff --git a/app/components/admin/settings/map_form_component.html.erb b/app/components/admin/settings/map_form_component.html.erb
index 7a0f00a95..c9738230f 100644
--- a/app/components/admin/settings/map_form_component.html.erb
+++ b/app/components/admin/settings/map_form_component.html.erb
@@ -1,21 +1,20 @@
 <div class="row">
   <div class="small-12 column">
-    <div id="admin-map" class="map"
-                        data-map
-                        data-map-center-latitude="<%= Setting["map.latitude"] %>"
-                        data-map-center-longitude="<%= Setting["map.longitude"] %>"
-                        data-map-zoom="<%= Setting["map.zoom"] %>"
-                        data-map-tiles-provider="<%= Rails.application.secrets.map_tiles_provider %>"
-                        data-map-tiles-provider-attribution="<%= Rails.application.secrets.map_tiles_provider_attribution %>"
-                        data-marker-editable="true"
-                        data-marker-latitude="<%= Setting["map.latitude"] %>"
-                        data-marker-longitude="<%= Setting["map.longitude"] %>"
-                        data-latitude-input-selector="#latitude"
-                        data-longitude-input-selector="#longitude"
-                        data-zoom-input-selector="#zoom">
-    </div>
-
     <%= form_tag admin_update_map_path, method: :put, id: "map-form" do |f| %>
+      <div id="admin-map" class="map"
+                          data-map
+                          data-map-center-latitude="<%= Setting["map.latitude"] %>"
+                          data-map-center-longitude="<%= Setting["map.longitude"] %>"
+                          data-map-zoom="<%= Setting["map.zoom"] %>"
+                          data-map-tiles-provider="<%= Rails.application.secrets.map_tiles_provider %>"
+                          data-map-tiles-provider-attribution="<%= Rails.application.secrets.map_tiles_provider_attribution %>"
+                          data-marker-editable="true"
+                          data-marker-latitude="<%= Setting["map.latitude"] %>"
+                          data-marker-longitude="<%= Setting["map.longitude"] %>"
+                          data-latitude-input-selector="#latitude"
+                          data-longitude-input-selector="#longitude"
+                          data-zoom-input-selector="#zoom">
+      </div>
 
       <%= hidden_field_tag :latitude, Setting["map.latitude"] %>
       <%= hidden_field_tag :longitude, Setting["map.longitude"] %>
diff --git a/spec/system/admin/settings_spec.rb b/spec/system/admin/settings_spec.rb
index 83c4369b3..1647ac690 100644
--- a/spec/system/admin/settings_spec.rb
+++ b/spec/system/admin/settings_spec.rb
@@ -92,8 +92,9 @@ describe "Admin settings", :admin do
 
       visit admin_settings_path
       click_link "Map configuration"
-      find("#admin-map").click
+
       within "#map-form" do
+        find("#admin-map").click
         click_button "Update"
       end