diff --git a/seshat/apps/core/templates/core/polity_map.html b/seshat/apps/core/templates/core/polity_map.html
index 6cec0b9e6..cafbf4b19 100644
--- a/seshat/apps/core/templates/core/polity_map.html
+++ b/seshat/apps/core/templates/core/polity_map.html
@@ -246,6 +246,9 @@ <h2 class="h2 text-dark federicka-medium">
         <script src="{% static 'core/js/map_functions.js' %}"></script>
         <script>
 
+            // Hide components/polity switch for now so "Polity components" is always displayed
+            document.getElementById('switchPolitiesComponentsFieldset').style.display = 'none';
+
             // Allows scrolling on the componentLegend div
             const componentLegend = document.getElementById('componentLegend');
             componentLegend.addEventListener('wheel', function (event) {
diff --git a/seshat/apps/core/templates/core/world_map.html b/seshat/apps/core/templates/core/world_map.html
index 719969da8..5f0f123ba 100644
--- a/seshat/apps/core/templates/core/world_map.html
+++ b/seshat/apps/core/templates/core/world_map.html
@@ -472,7 +472,9 @@ <h1 class="text-teal sliderDate" id="sliderDate2"></h1>
                                 </select>
                                 <div class="display-info-container">
                                     ℹ️
-                                </div><br><br>
+                                </div>
+                            </fieldset>
+                            <fieldset id="switchPoliticalBoundariesFieldset" style="display: block">
                                 <label for="baseMapOnly">Hide unselected</label>
                                 <input type="checkbox" id="hideUnselected" name="hideUnselected" onclick=plotPolities() disabled>
                                 <label for="baseMapOnly">Select all</label>
@@ -550,6 +552,9 @@ <h2>How to use the Seshat World Map</h2>
     <script src="{% static 'core/js/map_functions.js' %}"></script>
     <script>
 
+        // Hide components/polity switch for now so "Full polities" is always displayed
+        document.getElementById('switchPolitiesComponentsFieldset').style.display = 'none';
+
         // Set the default base map to Cesium Globe on mobile devices
         // Also place the enter year input field where the slider normally is
         var onMobile = false;
@@ -861,9 +866,9 @@ <h2>How to use the Seshat World Map</h2>
 
             // Show the switchPolitiesComponents dropdown if the variable is polity
             if (variable == 'polity') {
-                document.getElementById('switchPolitiesComponentsFieldset').style.display = 'block';
+                document.getElementById('switchPoliticalBoundariesFieldset').style.display = 'block';
             } else {
-                document.getElementById('switchPolitiesComponentsFieldset').style.display = 'none';
+                document.getElementById('switchPoliticalBoundariesFieldset').style.display = 'none';
             }
 
             // Load capital info if not already loaded