diff --git a/src/common/workspace-store.ts b/src/common/workspace-store.ts
index 5c9ef6f3b4..921a9126a9 100644
--- a/src/common/workspace-store.ts
+++ b/src/common/workspace-store.ts
@@ -243,7 +243,6 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
       throw new Error(`workspace ${id} doesn't exist`);
     }
     this.currentWorkspaceId = id;
-    clusterStore.setActive(null);
   }
 
   @action
diff --git a/src/renderer/components/+workspaces/workspaces.tsx b/src/renderer/components/+workspaces/workspaces.tsx
index 7ece5f6a8f..7e3b9647f2 100644
--- a/src/renderer/components/+workspaces/workspaces.tsx
+++ b/src/renderer/components/+workspaces/workspaces.tsx
@@ -9,6 +9,8 @@ import { CommandOverlay } from "../command-palette/command-container";
 import { AddWorkspace } from "./add-workspace";
 import { RemoveWorkspace } from "./remove-workspace";
 import { EditWorkspace } from "./edit-workspace";
+import { landingURL } from "../+landing-page";
+import { clusterViewURL } from "../cluster-manager/cluster-view.route";
 
 @observer
 export class ChooseWorkspace extends React.Component {
@@ -54,7 +56,14 @@ export class ChooseWorkspace extends React.Component {
     }
 
     workspaceStore.setActive(id);
-    navigate("/");
+    const clusterId = workspaceStore.getById(id).lastActiveClusterId;
+
+    if (clusterId) {
+      navigate(clusterViewURL({ params: { clusterId } }));
+    } else {
+      navigate(landingURL());
+    }
+
     CommandOverlay.close();
   }