diff --git a/frontend/src/app/messages/page.tsx b/frontend/src/app/messages/page.tsx
index 033d5969..62360bf0 100644
--- a/frontend/src/app/messages/page.tsx
+++ b/frontend/src/app/messages/page.tsx
@@ -53,8 +53,8 @@ function StandardMessagesList() {
   }
 
   return (
-    <section className="app-surface rounded-2xl p-4">
-      <div className="mb-4 flex flex-wrap items-center justify-between gap-2">
+    <section className="app-surface flex h-[calc(100dvh_-_8rem_-_env(safe-area-inset-bottom))] min-h-0 flex-col overflow-hidden rounded-2xl p-4 lg:block lg:h-auto lg:overflow-visible">
+      <div className="mb-4 flex shrink-0 flex-wrap items-center justify-between gap-2">
         <p className="app-text-muted text-sm font-semibold uppercase tracking-wide">Сообщения</p>
         <div className="flex items-center gap-1">
           <MessagesFocusModeButton enabled={false} onChange={(enabled) => setMode(enabled ? "wide" : "standard")} />
@@ -65,9 +65,11 @@ function StandardMessagesList() {
         </div>
       </div>
 
-      <MessagesChatListControls userId={user?.id} chatTypeCounts={chatTypeCounts} />
+      <div className="shrink-0">
+        <MessagesChatListControls userId={user?.id} chatTypeCounts={chatTypeCounts} />
+      </div>
 
-      <div className="space-y-2">
+      <div className="min-h-0 flex-1 space-y-2 overflow-y-auto overscroll-y-contain pr-1 lg:overflow-visible lg:pr-0">
         {visibleChats.length === 0 ? (
           <div className="app-surface-muted rounded-xl p-6 text-center">
             <p className="app-text-muted text-sm">Чаты не найдены</p>
diff --git a/frontend/src/app/tasks/page.tsx b/frontend/src/app/tasks/page.tsx
index 1ec26ce4..55e962b8 100644
--- a/frontend/src/app/tasks/page.tsx
+++ b/frontend/src/app/tasks/page.tsx
@@ -7418,7 +7418,7 @@ function TasksPageContent() {
             wideMode={desktopWideMode}
             onWideModeChange={changeDesktopWideMode}
             userId={user?.id ?? null}
-            className={`${mobileBoardOpen ? "hidden" : "flex"} w-full ${desktopWideMode ? "lg:flex lg:h-full lg:shrink-0" : ""}`}
+            className={`${mobileBoardOpen ? "hidden" : "flex"} h-[calc(100dvh_-_8rem_-_env(safe-area-inset-bottom))] w-full ${desktopWideMode ? "lg:flex lg:h-full lg:shrink-0" : ""}`}
           />
 
           <div className={`${mobileBoardOpen ? "flex" : "hidden"} relative min-h-0 min-w-0 flex-1 flex-col gap-4 ${desktopWideMode ? "lg:flex lg:h-full" : ""}`}>
diff --git a/frontend/src/components/tasks/TaskBoardNavigator.tsx b/frontend/src/components/tasks/TaskBoardNavigator.tsx
index adee08c6..3a447213 100644
--- a/frontend/src/components/tasks/TaskBoardNavigator.tsx
+++ b/frontend/src/components/tasks/TaskBoardNavigator.tsx
@@ -466,12 +466,10 @@ export default function TaskBoardNavigator({
     <>
       <aside
         ref={menusRef}
-        className={`flex min-h-0 flex-col overflow-visible transition-[width] duration-200 ${
+        className={`flex min-h-0 flex-col overflow-hidden transition-[width] duration-200 ${
           compactNavigator ? "bg-transparent" : "app-surface rounded-2xl"
         } ${
-          wideMode
-            ? `${compactNavigator ? "lg:w-[4.75rem]" : "lg:w-[24rem]"} lg:overflow-hidden`
-            : ""
+          wideMode ? (compactNavigator ? "lg:w-[4.75rem]" : "lg:w-[24rem]") : ""
         } ${className}`}
       >
         <div
@@ -753,9 +751,7 @@ export default function TaskBoardNavigator({
       </div>
       ) : null}
 
-      <div className={`tasks-column-scroll flex-none overflow-visible pb-4 ${
-        wideMode ? "lg:min-h-0 lg:flex-1 lg:overflow-y-auto" : ""
-      } ${compactNavigator ? "px-2 pt-2" : "px-4"}`}>
+      <div className={`tasks-column-scroll min-h-0 flex-1 overflow-y-auto overscroll-y-contain pb-4 ${compactNavigator ? "px-2 pt-2" : "px-4"}`}>
         {visibleBoards.length > 0 ? (
           <div className="space-y-1">
             {visibleBoards.map((board) => (