diff --git a/website/src/lib/components/layer-control/LayerControlSettings.svelte b/website/src/lib/components/layer-control/LayerControlSettings.svelte
index 39cf84aa..7fc29634 100644
--- a/website/src/lib/components/layer-control/LayerControlSettings.svelte
+++ b/website/src/lib/components/layer-control/LayerControlSettings.svelte
@@ -30,7 +30,7 @@
 	} = settings;
 
 	export let open: boolean;
-	let accordionValue = 'layer-selection';
+	let accordionValue: string | string[] | undefined = undefined;
 
 	let selectedOverlay = writable(undefined);
 	let overlayOpacity = writable([1]);
@@ -115,7 +115,7 @@
 	<Sheet.Content>
 		<Sheet.Header class="h-full">
 			<Sheet.Title>{$_('layers.settings')}</Sheet.Title>
-			<ScrollArea class="w-[105%] pr-4">
+			<ScrollArea class="w-[105%] min-h-full pr-4">
 				<Sheet.Description>
 					{$_('layers.settings_help')}
 				</Sheet.Description>
@@ -162,7 +162,7 @@
 									<Select.Trigger class="h-8 mr-1">
 										<Select.Value />
 									</Select.Trigger>
-									<Select.Content>
+									<Select.Content class="h-fit max-h-[40dvh] overflow-y-auto">
 										{#each Object.keys(overlays) as id}
 											{#if isSelected($selectedOverlayTree, id)}
 												<Select.Item value={id}>{$_(`layers.label.${id}`)}</Select.Item>
diff --git a/website/src/lib/components/ui/select/select-trigger.svelte b/website/src/lib/components/ui/select/select-trigger.svelte
index ed0bc7e7..f5b9306a 100644
--- a/website/src/lib/components/ui/select/select-trigger.svelte
+++ b/website/src/lib/components/ui/select/select-trigger.svelte
@@ -12,7 +12,7 @@
 
 <SelectPrimitive.Trigger
 	class={cn(
-		"flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+		"flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-destructive [&>span]:line-clamp-1 data-[placeholder]:[&>span]:text-muted-foreground",
 		className
 	)}
 	{...$$restProps}