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 a16a3e9dba..d746c9a9e7 100644
--- a/packages/frontend/core/src/modules/workbench/view/route-container.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
@@ -54,12 +54,14 @@ export const RouteContainer = ({ route }: Props) => {
           <SidebarSwitch className={styles.leftSidebarButton} />
         )}
         <view.header.Target className={styles.viewHeaderContainer} />
-        {viewPosition.isLast && !rightSidebarOpen && rightSidebarHasViews && (
+        {viewPosition.isLast && !rightSidebarOpen && (
           <>
-            <ToggleButton
-              className={styles.rightSidebarButton}
-              onToggle={handleToggleRightSidebar}
-            />
+            {rightSidebarHasViews && (
+              <ToggleButton
+                className={styles.rightSidebarButton}
+                onToggle={handleToggleRightSidebar}
+              />
+            )}
             {isWindowsDesktop && (
               <div className={styles.windowsAppControlsContainer}>
                 <WindowsAppControls />