diff --git a/web/src/routes/discover/+page.svelte b/web/src/routes/discover/+page.svelte
index d00badf6..cc751370 100644
--- a/web/src/routes/discover/+page.svelte
+++ b/web/src/routes/discover/+page.svelte
@@ -115,9 +115,16 @@
   ];
 </script>
 
-<DiscoverTabs />
+<!--
+  Page layout: a full-height flex column so the persistent chrome
+  (DiscoverTabs, search input, facet tabs) stays anchored at the top
+  while only the result grid scrolls. Main has overflow-y-auto, but
+  with h-full + flex-col + min-h-0 on the scroll region, this page
+  contains its own overflow and main's scroll never triggers.
+-->
+<div class="flex h-full flex-col gap-4">
+  <DiscoverTabs />
 
-<div class="space-y-6 pt-6">
   <input
     type="search"
     aria-label="Search Lidarr"
@@ -127,7 +134,9 @@
   />
 
   {#if debouncedQ === ''}
-    <SuggestionFeed />
+    <div class="min-h-0 flex-1 overflow-y-auto pb-4">
+      <SuggestionFeed />
+    </div>
   {:else}
     <header class="space-y-1">
       <h2 class="font-display text-2xl font-medium text-text-primary">
@@ -157,26 +166,28 @@
       </ul>
     </nav>
 
-    {#if query.isError}
-      <ApiErrorBanner error={query.error} onRetry={query.refetch} />
-    {:else if query.isPending}
-      <p class="text-text-secondary">Searching…</p>
-    {:else if results.length === 0}
-      <p class="text-text-secondary">Nothing to add for that search yet.</p>
-    {:else}
-      <div class="grid grid-cols-2 gap-4 sm:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5">
-        {#each results as r (r.mbid)}
-          <DiscoverResultCard
-            kind={activeKind}
-            title={r.name}
-            subtitle={r.secondary_text}
-            imageUrl={r.image_url || undefined}
-            state={cardState(r)}
-            onRequest={() => handleRequestClick(r)}
-          />
-        {/each}
-      </div>
-    {/if}
+    <div class="min-h-0 flex-1 overflow-y-auto pb-4">
+      {#if query.isError}
+        <ApiErrorBanner error={query.error} onRetry={query.refetch} />
+      {:else if query.isPending}
+        <p class="text-text-secondary">Searching…</p>
+      {:else if results.length === 0}
+        <p class="text-text-secondary">Nothing to add for that search yet.</p>
+      {:else}
+        <div class="grid grid-cols-2 gap-4 sm:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5">
+          {#each results as r (r.mbid)}
+            <DiscoverResultCard
+              kind={activeKind}
+              title={r.name}
+              subtitle={r.secondary_text}
+              imageUrl={r.image_url || undefined}
+              state={cardState(r)}
+              onRequest={() => handleRequestClick(r)}
+            />
+          {/each}
+        </div>
+      {/if}
+    </div>
   {/if}
 </div>