diff --git a/app/w/components/toolbar/toolbar.tsx b/app/w/components/toolbar/toolbar.tsx
index bed1b931f5..3414da2d70 100644
--- a/app/w/components/toolbar/toolbar.tsx
+++ b/app/w/components/toolbar/toolbar.tsx
@@ -49,7 +49,7 @@ export function Toolbar() {
   }
 
   return (
-    <div className="relative z-1 hidden h-[calc(100vh-4rem)] overflow-y-auto w-64 border-r bg-background sm:block">
+    <div className="fixed left-14 top-16 z-10 h-[calc(100vh-4rem)] overflow-y-auto w-64 border-r bg-background sm:block">
       <div className="px-4 pt-4">
         <div className="relative">
           <Search className="absolute left-3 top-[50%] h-4 w-4 -translate-y-[50%] text-muted-foreground" />
diff --git a/app/w/layout.tsx b/app/w/layout.tsx
index dcf8fba26a..19e35e091f 100644
--- a/app/w/layout.tsx
+++ b/app/w/layout.tsx
@@ -14,9 +14,9 @@ export default function WorkspaceLayout({
         <Sidebar />
         <div className="flex-1 flex flex-col pl-14">
           <ControlBar />
-          <div className="flex flex-1 h-16">
+          <div className="h-16">
             <Toolbar />
-            <main className="flex-1 grid items-start gap-2 bg-muted/40 h-[calc(100vh-4rem)]">
+            <main className="grid items-start gap-2 bg-muted/40 h-[calc(100vh-4rem)]">
               {children}
             </main>
           </div>