diff --git a/frontend-web/src/pages/PageRoutes.tsx b/frontend-web/src/pages/PageRoutes.tsx
index 102aec7f..b227d3ad 100644
--- a/frontend-web/src/pages/PageRoutes.tsx
+++ b/frontend-web/src/pages/PageRoutes.tsx
@@ -21,14 +21,19 @@ function PageLayout() {
       )}
       <main
         className={`min-h-screen transition-[padding] duration-300 ${
-          SIDEBAR_ENABLED && !collapsed ? "pl-16 md:pl-64" : "pl-16"
+          !SIDEBAR_ENABLED ? "" : collapsed ? "pl-16" : "pl-16 md:pl-64"
         }`}
       >
         <Routes>
           <Route index element={<Navigate to="workspace" replace />} />
           <Route
             path="workspace/*"
-            element={<WorkspaceRoutes pageSidebarCollapsed={collapsed} />}
+            element={
+              <WorkspaceRoutes
+                pageSidebarCollapsed={collapsed}
+                pageSidebarHidden={!SIDEBAR_ENABLED}
+              />
+            }
           />
         </Routes>
       </main>
diff --git a/frontend-web/src/pages/WorkspaceRoutes.tsx b/frontend-web/src/pages/WorkspaceRoutes.tsx
index 15b7eb1e..bf1527a6 100644
--- a/frontend-web/src/pages/WorkspaceRoutes.tsx
+++ b/frontend-web/src/pages/WorkspaceRoutes.tsx
@@ -20,16 +20,24 @@ import ScheduledTasksPage from "./ScheduledTasksPage";
 function WorkspaceLayout({
   children,
   pageSidebarCollapsed,
+  pageSidebarHidden = false,
 }: {
   children: ReactNode;
   pageSidebarCollapsed: boolean;
+  pageSidebarHidden?: boolean;
 }) {
+  const pageSidebarWidth = pageSidebarHidden
+    ? "0rem"
+    : pageSidebarCollapsed
+      ? "4rem"
+      : "16rem";
+
   return (
     <SidebarProvider
       className="h-screen w-full overflow-x-hidden [&_[data-slot=sidebar-container]]:left-[var(--page-sidebar-width)]"
       style={
         {
-          "--page-sidebar-width": pageSidebarCollapsed ? "4rem" : "16rem",
+          "--page-sidebar-width": pageSidebarWidth,
         } as CSSProperties
       }
       // Keep the fixed workspace sidebar aligned to the outer page sidebar width.
@@ -57,16 +65,20 @@ function ChatRuntime({ children }: { children: ReactNode }) {
 
 export default function WorkspaceRoutes({
   pageSidebarCollapsed = false,
+  pageSidebarHidden = false,
 }: {
   pageSidebarCollapsed?: boolean;
+  pageSidebarHidden?: boolean;
 }) {
+  const layoutProps = { pageSidebarCollapsed, pageSidebarHidden };
+
   return (
     <Routes>
       <Route index element={<Navigate to="chats/new" replace />} />
       <Route
         path="chats"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <ChatsPage />
           </WorkspaceLayout>
         }
@@ -74,7 +86,7 @@ export default function WorkspaceRoutes({
       <Route
         path="chats/:thread_id"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <ChatRuntime>
               <ChatPage />
             </ChatRuntime>
@@ -84,7 +96,7 @@ export default function WorkspaceRoutes({
       <Route
         path="agents"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <AgentsPage />
           </WorkspaceLayout>
         }
@@ -92,7 +104,7 @@ export default function WorkspaceRoutes({
       <Route
         path="agents/new"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <NewAgentPage />
           </WorkspaceLayout>
         }
@@ -104,7 +116,7 @@ export default function WorkspaceRoutes({
       <Route
         path="agents/:agent_id/chats/:thread_id"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <ChatRuntime>
               <AgentChatPage />
             </ChatRuntime>
@@ -118,7 +130,7 @@ export default function WorkspaceRoutes({
       <Route
         path="scheduled/tasks"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <ScheduledTasksPage />
           </WorkspaceLayout>
         }
@@ -126,7 +138,7 @@ export default function WorkspaceRoutes({
       <Route
         path="scheduled/runs/:run_id"
         element={
-          <WorkspaceLayout pageSidebarCollapsed={pageSidebarCollapsed}>
+          <WorkspaceLayout {...layoutProps}>
             <ScheduledTaskRunDetailPage />
           </WorkspaceLayout>
         }