diff --git a/src/components/admin/admin-shell.tsx b/src/components/admin/admin-shell.tsx
index f0bd0209c..39f94bb37 100644
--- a/src/components/admin/admin-shell.tsx
+++ b/src/components/admin/admin-shell.tsx
@@ -316,7 +316,7 @@ export function AdminShell({ active, children }: AdminShellProps) {
           aria-label={t("admin.shell.sectionsNav")}
           className="hidden md:col-start-1 md:row-start-2 md:block"
         >
-          <div className="sticky top-20">
+          <div className="no-scrollbar sticky top-6 max-h-[calc(100dvh-5.5rem)] overflow-y-auto">
             <ul className="space-y-1">
               <li>
                 <Link
diff --git a/src/components/settings/settings-shell.tsx b/src/components/settings/settings-shell.tsx
index d9397a3ac..e091cfc9c 100644
--- a/src/components/settings/settings-shell.tsx
+++ b/src/components/settings/settings-shell.tsx
@@ -502,7 +502,7 @@ export function SettingsShell({
           aria-label={t("settings.shell.sectionsNav")}
           className="hidden md:col-start-1 md:row-start-2 md:block"
         >
-          <div className="sticky top-20">
+          <div className="no-scrollbar sticky top-6 max-h-[calc(100dvh-5.5rem)] overflow-y-auto">
             <ul className="space-y-1">
               {visibleSections.map((section) => {
                 const isActive = section.slug === activeSlug;