diff --git a/packages/frontend/core/src/modules/app-sidebar/views/fallback.css.ts b/packages/frontend/core/src/modules/app-sidebar/views/fallback.css.ts
index 2992c94456..d2415414fa 100644
--- a/packages/frontend/core/src/modules/app-sidebar/views/fallback.css.ts
+++ b/packages/frontend/core/src/modules/app-sidebar/views/fallback.css.ts
@@ -1,7 +1,7 @@
 import { style } from '@vanilla-extract/css';
 
 export const fallback = style({
-  padding: '4px 16px',
+  padding: '4px 8px',
   height: '100%',
   overflow: 'clip',
 });
@@ -13,7 +13,7 @@ export const fallbackHeader = style({
   flexDirection: 'row',
   gap: '8px',
   overflow: 'hidden',
-  height: '52px',
+  height: '42px',
 });
 
 export const spacer = style({
diff --git a/packages/frontend/core/src/modules/workbench/view/route-container.css.ts b/packages/frontend/core/src/modules/workbench/view/route-container.css.ts
index d85dd2ae16..7a5b44db0b 100644
--- a/packages/frontend/core/src/modules/workbench/view/route-container.css.ts
+++ b/packages/frontend/core/src/modules/workbench/view/route-container.css.ts
@@ -19,13 +19,18 @@ export const header = style({
   alignItems: 'center',
   flexShrink: 0,
   background: cssVar('backgroundPrimaryColor'),
-  padding: '0 16px 0px 8px',
+  padding: '0 16px',
   contain: 'strict',
   '@media': {
     print: {
       display: 'none',
     },
   },
+  selectors: {
+    '&[data-show-switch=true]': {
+      paddingLeft: 8,
+    },
+  },
 });
 
 export const viewBodyContainer = style({
diff --git a/packages/frontend/core/src/modules/workbench/view/route-container.tsx b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
index 4ecbbe13c5..85a2c33351 100644
--- a/packages/frontend/core/src/modules/workbench/view/route-container.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
@@ -52,10 +52,15 @@ export const RouteContainer = () => {
     workbench.toggleSidebar();
   }, [workbench]);
 
+  const showSwitch = !BUILD_CONFIG.isElectron && viewPosition.isFirst;
+
   return (
     <div className={styles.root}>
-      <div className={styles.header}>
-        {!BUILD_CONFIG.isElectron && viewPosition.isFirst && (
+      <div
+        className={styles.header}
+        data-show-switch={showSwitch && !leftSidebarOpen}
+      >
+        {showSwitch && (
           <SidebarSwitch
             show={!leftSidebarOpen}
             className={styles.leftSidebarButton}