diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index 1e50d3fb36..a61a603fa2 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -464,13 +464,6 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
   useActiveWorktreeNewAction();
   useGlobalNewWorkspaceAction();
 
-  const sidebarChrome = (
-    <SidebarChrome
-      showSidebar={chromeEnabled && (isCompactLayout || !isFocusModeEnabled)}
-      keyboardShortcutsEnabled={keyboardShortcutsEnabled}
-    />
-  );
-
   const appContentMinimumWidth = resolveDesktopAppContentMinimum({
     isSettingsRoute: pathname.includes("/settings"),
     isWorkspaceExplorerOpen: pathname.includes("/workspace/") && isDesktopFileExplorerOpen,
@@ -488,6 +481,12 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
       viewportWidth,
     });
   const contentWindowChromeCorners = desktopSidebarRendered ? "top-right" : "both";
+  const sidebarChrome = (
+    <SidebarChrome
+      showSidebar={isCompactLayout ? chromeEnabled : desktopSidebarRendered}
+      keyboardShortcutsEnabled={keyboardShortcutsEnabled}
+    />
+  );
   const workspaceChrome = (
     <View style={rowStyle}>
       {!isCompactLayout ? (