diff --git a/memento-note/app/(main)/layout.tsx b/memento-note/app/(main)/layout.tsx
index 9bfe4ec..b37e2be 100644
--- a/memento-note/app/(main)/layout.tsx
+++ b/memento-note/app/(main)/layout.tsx
@@ -37,7 +37,7 @@ export default async function MainLayout({
     >
       {/* No top-bar header — sidebar-only navigation (architectural-grid design) */}
       <div className="flex h-screen overflow-hidden bg-memento-desk dark:bg-background">
-        <Suspense fallback={<div className="hidden w-80 xl:w-[22rem] 2xl:w-[26rem] shrink-0 md:block" />}>
+        <Suspense fallback={<div className="hidden w-80 xl:w-[22rem] 2xl:w-[26rem] shrink-0 md:block h-screen self-stretch" />}>
           <Sidebar user={session?.user} />
         </Suspense>
 
diff --git a/memento-note/components/sidebar.tsx b/memento-note/components/sidebar.tsx
index 6169248..28f5059 100644
--- a/memento-note/components/sidebar.tsx
+++ b/memento-note/components/sidebar.tsx
@@ -1182,7 +1182,7 @@ export function Sidebar({ className, user }: { className?: string; user?: any })
           isImmersiveRoute && userCollapsed
             ? 'fixed inset-y-0 start-0 z-[70]'
             : 'fixed inset-y-0 start-0 z-[70] md:relative md:z-auto',
-          'h-full min-h-0 w-80 xl:w-[22rem] 2xl:w-[26rem] shrink-0 flex flex-row overflow-hidden',
+          'h-screen min-h-0 w-80 xl:w-[22rem] 2xl:w-[26rem] shrink-0 flex flex-row overflow-hidden self-stretch',
           'transition-transform duration-300 ease-in-out',
           isImmersiveRoute && userCollapsed
             ? '-translate-x-full'