diff --git a/src/renderer/components/layout/main-layout-header.tsx b/src/renderer/components/layout/main-layout-header.tsx
index c9445433fd..6108fc0745 100644
--- a/src/renderer/components/layout/main-layout-header.tsx
+++ b/src/renderer/components/layout/main-layout-header.tsx
@@ -29,10 +29,10 @@ export const MainLayoutHeader = observer(({ cluster, className }: Props) => {
     <MenuItem onClick={actions.SHOW_SETTINGS}>
       <span>Settings</span>
     </MenuItem>
-    { cluster.online && <MenuItem onClick={actions.DISCONNECT}>
+    <MenuItem onClick={actions.DISCONNECT}>
       <span>Disconnect</span>
-    </MenuItem> }
-    { cluster.online && !cluster.isManaged && <MenuItem onClick={actions.REMOVE}>
+    </MenuItem>
+    { !cluster.isManaged && <MenuItem onClick={actions.REMOVE}>
       <span>Remove</span>
     </MenuItem> }
   </Menu>;
diff --git a/src/renderer/components/layout/main-layout.tsx b/src/renderer/components/layout/main-layout.tsx
index 7be6148e3e..71757e88c2 100755
--- a/src/renderer/components/layout/main-layout.tsx
+++ b/src/renderer/components/layout/main-layout.tsx
@@ -10,6 +10,7 @@ import { ErrorBoundary } from "../error-boundary";
 import { ResizeDirection, ResizeGrowthDirection, ResizeSide, ResizingAnchor } from "../resizing-anchor";
 import { MainLayoutHeader } from "./main-layout-header";
 import { Sidebar } from "./sidebar";
+import { workspaceStore } from "../../../common/workspace-store";
 
 export interface MainLayoutProps {
   className?: any;