diff --git a/components/chat-shell.tsx b/components/chat-shell.tsx
index 8134bf384..adebf577f 100644
--- a/components/chat-shell.tsx
+++ b/components/chat-shell.tsx
@@ -74,40 +74,32 @@ export function ChatShell({
     return <div className="h-svh w-full overflow-y-auto">{children}</div>;
   }
 
+  if (isAiCadWorkspace) {
+    return <div className="min-h-svh w-full overflow-y-auto">{children}</div>;
+  }
+
   return (
     <SidebarProvider defaultOpen={!isCollapsed}>
-      {isAiCadWorkspace ? null : (
-        <TopNavbar
-          agentEnabled={agentEnabled}
-          customLinks={customLinks}
-          isAdmin={isAdmin}
-          productPlanningEnabled={productPlanningEnabled}
-          rankingEnabled={rankingEnabled}
-          settingsHref={settingsHref}
-          siteLogo={siteLogo}
-          siteLogoDark={siteLogoDark}
-          siteName={siteName}
-          toolbox1Enabled={toolbox1Enabled}
-          toolbox1Name={toolbox1Name}
-          toolbox2Enabled={toolbox2Enabled}
-          toolbox2Name={toolbox2Name}
-          tutorialEnabled={tutorialEnabled}
-          tutorialVideos={tutorialVideos}
-        />
-      )}
-      <div
-        className={
-          isAiCadWorkspace
-            ? "flex min-h-svh w-full pl-16 [--sidebar-offset:4rem]"
-            : "flex h-svh w-full overflow-hidden pl-16 [--sidebar-offset:4rem]"
-        }
-      >
+      <TopNavbar
+        agentEnabled={agentEnabled}
+        customLinks={customLinks}
+        isAdmin={isAdmin}
+        productPlanningEnabled={productPlanningEnabled}
+        rankingEnabled={rankingEnabled}
+        settingsHref={settingsHref}
+        siteLogo={siteLogo}
+        siteLogoDark={siteLogoDark}
+        siteName={siteName}
+        toolbox1Enabled={toolbox1Enabled}
+        toolbox1Name={toolbox1Name}
+        toolbox2Enabled={toolbox2Enabled}
+        toolbox2Name={toolbox2Name}
+        tutorialEnabled={tutorialEnabled}
+        tutorialVideos={tutorialVideos}
+      />
+      <div className="flex h-svh w-full overflow-hidden pl-16 [--sidebar-offset:4rem]">
         <AppSidebar user={user} />
-        <SidebarInset
-          className={isAiCadWorkspace ? "min-h-svh overflow-visible" : "h-full"}
-        >
-          {children}
-        </SidebarInset>
+        <SidebarInset className="h-full">{children}</SidebarInset>
       </div>
     </SidebarProvider>
   );