diff --git a/web/src/components/config-form/sections/BaseSection.tsx b/web/src/components/config-form/sections/BaseSection.tsx
index 10415468d..7398598bf 100644
--- a/web/src/components/config-form/sections/BaseSection.tsx
+++ b/web/src/components/config-form/sections/BaseSection.tsx
@@ -749,6 +749,10 @@ export function ConfigSection({
     ? t(`${sectionPath}.description`, { ns: configNamespace })
     : undefined;
 
+  if (!sectionSchema || !config) {
+    return <ActivityIndicator />;
+  }
+
   const sectionContent = (
     <div className="space-y-6">
       <ConfigForm
diff --git a/web/src/components/config-form/theme/widgets/ObjectLabelSwitchesWidget.tsx b/web/src/components/config-form/theme/widgets/ObjectLabelSwitchesWidget.tsx
index 24bec259d..312821378 100644
--- a/web/src/components/config-form/theme/widgets/ObjectLabelSwitchesWidget.tsx
+++ b/web/src/components/config-form/theme/widgets/ObjectLabelSwitchesWidget.tsx
@@ -93,6 +93,7 @@ export function ObjectLabelSwitchesWidget(props: WidgetProps) {
         getEntities: getObjectLabels,
         getDisplayLabel: getObjectLabelDisplayName,
         i18nKey: "objectLabels",
+        listClassName: "max-h-64 overflow-y-auto scrollbar-container",
       }}
     />
   );
diff --git a/web/src/components/config-form/theme/widgets/ZoneSwitchesWidget.tsx b/web/src/components/config-form/theme/widgets/ZoneSwitchesWidget.tsx
index c3bf4b09c..519b5ba24 100644
--- a/web/src/components/config-form/theme/widgets/ZoneSwitchesWidget.tsx
+++ b/web/src/components/config-form/theme/widgets/ZoneSwitchesWidget.tsx
@@ -42,6 +42,7 @@ export function ZoneSwitchesWidget(props: WidgetProps) {
         getEntities: getZoneNames,
         getDisplayLabel: getZoneDisplayName,
         i18nKey: "zoneNames",
+        listClassName: "max-h-64 overflow-y-auto scrollbar-container",
       }}
     />
   );