diff --git a/web/src/lib/AppShell.svelte b/web/src/lib/AppShell.svelte
index 52e13eb..0053f08 100644
--- a/web/src/lib/AppShell.svelte
+++ b/web/src/lib/AppShell.svelte
@@ -60,7 +60,7 @@
 <div class="bg-background flex min-h-screen">
 	<aside
 		class={cn(
-			'border-border bg-sidebar flex shrink-0 flex-col border-r transition-all duration-200',
+			'border-border bg-sidebar sticky top-0 flex h-screen shrink-0 flex-col overflow-hidden border-r transition-all duration-200',
 			collapsed ? 'w-14' : 'w-56'
 		)}
 		aria-label="Основная навигация"
@@ -122,7 +122,7 @@
 		<Separator />
 
 		<!-- Main nav -->
-		<nav class="flex flex-1 flex-col gap-0.5 p-2">
+		<nav class="flex flex-1 flex-col gap-0.5 overflow-y-auto p-2">
 			{#each nav as item (item.href)}
 				{@const Icon = item.icon}
 				{@const active = isActive(item.href)}