diff --git a/admin-spa/src/App.tsx b/admin-spa/src/App.tsx
index ebe74bc..40ca763 100644
--- a/admin-spa/src/App.tsx
+++ b/admin-spa/src/App.tsx
@@ -414,13 +414,13 @@ function Shell() {
           isDesktop ? (
             <div className="flex flex-1 min-h-0">
               <Sidebar />
-              <main className="flex-1 overflow-auto">
+              <main className="flex-1 flex flex-col min-h-0">
                 {isDashboardRoute ? (
                   <DashboardSubmenuBar items={main.children} fullscreen={true} />
                 ) : (
                   <SubmenuBar items={main.children} fullscreen={true} />
                 )}
-                <div className="p-4">
+                <div className="flex-1 overflow-auto p-4">
                   <AppRoutes />
                 </div>
               </main>
@@ -433,8 +433,10 @@ function Shell() {
               ) : (
                 <SubmenuBar items={main.children} fullscreen={true} />
               )}
-              <main className="flex-1 p-4 overflow-auto">
-                <AppRoutes />
+              <main className="flex-1 flex flex-col min-h-0">
+                <div className="flex-1 overflow-auto p-4">
+                  <AppRoutes />
+                </div>
               </main>
             </div>
           )
@@ -446,8 +448,10 @@ function Shell() {
             ) : (
               <SubmenuBar items={main.children} fullscreen={false} />
             )}
-            <main className="flex-1 p-4 overflow-auto">
-              <AppRoutes />
+            <main className="flex-1 flex flex-col min-h-0">
+              <div className="flex-1 overflow-auto p-4">
+                <AppRoutes />
+              </div>
             </main>
           </div>
         )}
diff --git a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
index fe0d036..a771052 100644
--- a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
+++ b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
@@ -33,31 +33,11 @@ export function SettingsLayout({
     }
   };
 
-  // Detect fullscreen mode
-  const [isFullscreen, setIsFullscreen] = React.useState(false);
-  
-  React.useEffect(() => {
-    const checkFullscreen = () => {
-      setIsFullscreen(document.querySelector('.woonoow-fullscreen-root') !== null);
-    };
-    
-    checkFullscreen();
-    // Re-check on route changes or mode toggles
-    const observer = new MutationObserver(checkFullscreen);
-    observer.observe(document.body, { attributes: true, attributeFilter: ['class'], subtree: true });
-    
-    return () => observer.disconnect();
-  }, []);
-
-  // In fullscreen: submenu is inside scrollable area, so offset by submenu height (49px)
-  // In WP-Admin: submenu is outside scrollable area, so no offset needed (top-0)
-  const stickyTop = isFullscreen ? 'top-[49px]' : 'top-0';
-
   return (
     <div className="space-y-6">
       {/* Sticky Header with Save Button - Edge to edge */}
       {onSave && (
-        <div className={`sticky ${stickyTop} z-10 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 -mx-4 px-4 mb-6`}>
+        <div className="sticky top-0 z-10 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 -mx-4 px-4 mb-6">
           <div className="container px-0 max-w-5xl mx-auto py-3 flex items-center justify-between">
             <div>
               <h1 className="text-lg font-semibold">{title}</h1>