diff --git a/sim/app/w/[id]/layout.tsx b/sim/app/w/[id]/layout.tsx
index d2d546be06..8402b3d62c 100644
--- a/sim/app/w/[id]/layout.tsx
+++ b/sim/app/w/[id]/layout.tsx
@@ -1,17 +1,11 @@
 import { Chat } from './components/chat/chat'
-import { ControlBar } from './components/control-bar/control-bar'
 import { ErrorBoundary } from './components/error'
-import { Panel } from './components/panel/panel'
-import { Toolbar } from './components/toolbar/toolbar'
 
 export default function WorkflowLayout({ children }: { children: React.ReactNode }) {
   return (
     <>
-      <ControlBar />
-      <Toolbar />
       {/* <Chat /> */}
-      <Panel />
-      <main className="grid items-start gap-2 bg-muted/40 h-[calc(100vh-4rem)]">
+      <main className="bg-muted/40 overflow-hidden h-full">
         <ErrorBoundary>{children}</ErrorBoundary>
       </main>
     </>
diff --git a/sim/app/w/[id]/workflow.tsx b/sim/app/w/[id]/workflow.tsx
index 262473c0fd..7ca6fa367f 100644
--- a/sim/app/w/[id]/workflow.tsx
+++ b/sim/app/w/[id]/workflow.tsx
@@ -23,7 +23,10 @@ import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import { NotificationList } from '@/app/w/[id]/components/notifications/notifications'
 import { getBlock } from '@/blocks'
+import { ControlBar } from './components/control-bar/control-bar'
 import { ErrorBoundary } from './components/error/index'
+import { Panel } from './components/panel/panel'
+import { Toolbar } from './components/toolbar/toolbar'
 import { WorkflowBlock } from './components/workflow-block/workflow-block'
 import { WorkflowEdge } from './components/workflow-edge/workflow-edge'
 import { LoopInput } from './components/workflow-loop/components/loop-input/loop-input'
@@ -470,8 +473,11 @@ function WorkflowContent() {
   }
 
   return (
-    <>
-      <div className="relative w-full h-[calc(100vh-4rem)]">
+    <div className="flex flex-col h-screen w-full overflow-hidden">
+      <ControlBar />
+      <Toolbar />
+      <Panel />
+      <div className="flex-1 relative w-full h-full">
         <NotificationList />
         <ReactFlow
           nodes={nodes}
@@ -509,12 +515,12 @@ function WorkflowContent() {
           noWheelClassName="allow-scroll"
           edgesFocusable={true}
           edgesUpdatable={true}
-          className="workflow-container"
+          className="workflow-container h-full"
         >
           <Background />
         </ReactFlow>
       </div>
-    </>
+    </div>
   )
 }