diff --git a/src/app/map/[id]/components/BoundaryHoverInfo/AreasList.tsx b/src/app/map/[id]/components/BoundaryHoverInfo/AreasList.tsx
index cffcd25a..7a2cedc3 100644
--- a/src/app/map/[id]/components/BoundaryHoverInfo/AreasList.tsx
+++ b/src/app/map/[id]/components/BoundaryHoverInfo/AreasList.tsx
@@ -39,7 +39,7 @@ export function AreasList({
       className="border-none"
       style={{ tableLayout: "auto", width: "auto" }}
     >
-      {multipleAreas && (
+      {multipleAreas && primaryLabel && (
         <TableHeader className="pointer-events-auto">
           <TableRow className="border-none hover:bg-transparent uppercase font-mono">
             <TableHead className="py-2 px-3 text-left h-8" />
@@ -91,23 +91,25 @@ export function AreasList({
                   <span className="truncate">{area.name}</span>
                 </div>
               </TableCell>
-              {area.primaryDisplayValue && !multipleAreas && (
+              {primaryLabel && !multipleAreas && (
                 <TableCell className="px-2 py-2 h-8">
                   <div className="w-px bg-neutral-200 h-full" />
                 </TableCell>
               )}
-              <TableCell className="py-2 px-3 whitespace-normal h-8">
-                {multipleAreas ? (
-                  area.primaryDisplayValue || "-"
-                ) : (
-                  <div className="flex flex-row justify-center items-center text-right">
-                    <span className="mr-3 text-muted-foreground uppercase font-mono text-xs">
-                      {primaryLabel}:
-                    </span>
-                    <span>{area.primaryDisplayValue}</span>
-                  </div>
-                )}
-              </TableCell>
+              {primaryLabel && (
+                <TableCell className="py-2 px-3 whitespace-normal h-8">
+                  {multipleAreas ? (
+                    area.primaryDisplayValue || "-"
+                  ) : (
+                    <div className="flex flex-row justify-center items-center text-right">
+                      <span className="mr-3 text-muted-foreground uppercase font-mono text-xs">
+                        {primaryLabel}:
+                      </span>
+                      <span>{area.primaryDisplayValue}</span>
+                    </div>
+                  )}
+                </TableCell>
+              )}
               {secondaryLabel && (
                 <TableCell className="py-2 px-3 whitespace-normal h-8">
                   {multipleAreas ? (
diff --git a/src/app/map/[id]/components/controls/VisualisationPanel/VisualisationPanel.tsx b/src/app/map/[id]/components/controls/VisualisationPanel/VisualisationPanel.tsx
index 4faf51c2..1810c940 100644
--- a/src/app/map/[id]/components/controls/VisualisationPanel/VisualisationPanel.tsx
+++ b/src/app/map/[id]/components/controls/VisualisationPanel/VisualisationPanel.tsx
@@ -48,6 +48,9 @@ import SteppedColorEditor from "./SteppedColorEditor";
 import type { AreaSetGroupCode } from "@/server/models/AreaSet";
 import type { DataSource } from "@/server/models/DataSource";
 
+const SELECT_TO_BUTTON_CLASSES =
+  "bg-background hover:bg-accent hover:text-accent-foreground hover:border-border font-medium cursor-pointer";
+
 function IncludeColumnsModal({
   dataSource,
   selectedColumns,
@@ -258,7 +261,7 @@ export default function VisualisationPanel({
             }
           >
             <SelectTrigger
-              className="w-full min-w-0"
+              className={cn("w-full min-w-0", SELECT_TO_BUTTON_CLASSES)}
               id="choropleth-boundary-select"
             >
               <SelectValue placeholder="Choose boundaries..." />
@@ -298,7 +301,7 @@ export default function VisualisationPanel({
             }
           >
             <SelectTrigger
-              className="w-full min-w-0"
+              className={cn("w-full min-w-0", SELECT_TO_BUTTON_CLASSES)}
               id="choropleth-calculation-select"
             >
               <SelectValue placeholder="Choose calculation..." />
@@ -425,7 +428,7 @@ export default function VisualisationPanel({
                 }
               >
                 <SelectTrigger
-                  className="w-full min-w-0"
+                  className={cn("w-full min-w-0", SELECT_TO_BUTTON_CLASSES)}
                   id="choropleth-aggregation-select"
                 >
                   <SelectValue placeholder="Choose an aggregation..." />
diff --git a/src/app/map/[id]/hooks/useChoropleth.ts b/src/app/map/[id]/hooks/useChoropleth.ts
index 51da49dc..e2eefd97 100644
--- a/src/app/map/[id]/hooks/useChoropleth.ts
+++ b/src/app/map/[id]/hooks/useChoropleth.ts
@@ -1,7 +1,8 @@
 "use client";
 
 import { useAtom } from "jotai";
-import { useMemo } from "react";
+import { useCallback, useMemo } from "react";
+import { AreaSetGroupCode } from "@/server/models/AreaSet";
 import { GeocodingType } from "@/server/models/DataSource";
 import {
   boundariesPanelOpenAtom,
@@ -15,10 +16,10 @@ import { useMapViews } from "./useMapViews";
 
 export function useChoropleth() {
   const zoom = useZoom();
-  const { viewConfig } = useMapViews();
+  const { viewConfig, updateViewConfig } = useMapViews();
   const choroplethDataSource = useChoroplethDataSource();
 
-  const [boundariesPanelOpen, setBoundariesPanelOpen] = useAtom(
+  const [boundariesPanelOpen, _setBoundariesPanelOpen] = useAtom(
     boundariesPanelOpenAtom,
   );
   const [selectedBivariateBucket, setSelectedBivariateBucket] = useAtom(
@@ -47,6 +48,16 @@ export function useChoropleth() {
     zoom,
   ]);
 
+  const setBoundariesPanelOpen = useCallback(
+    (open: boolean) => {
+      if (open && viewConfig.areaSetGroupCode === undefined) {
+        updateViewConfig({ areaSetGroupCode: AreaSetGroupCode.WMC24 });
+      }
+      _setBoundariesPanelOpen(open);
+    },
+    [_setBoundariesPanelOpen, updateViewConfig, viewConfig.areaSetGroupCode],
+  );
+
   return {
     boundariesPanelOpen,
     setBoundariesPanelOpen,
diff --git a/src/app/map/[id]/utils/mapView.ts b/src/app/map/[id]/utils/mapView.ts
index 3b15201e..7edede49 100644
--- a/src/app/map/[id]/utils/mapView.ts
+++ b/src/app/map/[id]/utils/mapView.ts
@@ -10,7 +10,7 @@ export const createNewViewConfig = (): MapViewConfig => {
     areaDataSourceId: "",
     areaDataColumn: "",
     areaDataNullIsZero: true,
-    areaSetGroupCode: null,
+    areaSetGroupCode: undefined,
     mapStyleName: MapStyleName.Light,
     showLabels: true,
     showBoundaryOutline: false,