diff --git a/src/common/workspace-store.ts b/src/common/workspace-store.ts
index 5aeb40eba8..394a28b1d4 100644
--- a/src/common/workspace-store.ts
+++ b/src/common/workspace-store.ts
@@ -3,7 +3,6 @@ import { BaseStore } from "./base-store";
 import { clusterStore } from "./cluster-store"
 import { landingURL } from "../renderer/components/+landing-page/landing-page.route";
 import { navigate } from "../renderer/navigation";
-import { clusterViewURL } from "../renderer/components/cluster-manager/cluster-view.route";
 
 export type WorkspaceId = string;
 export type ClusterId = string;
@@ -82,7 +81,6 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
     if (resetActiveCluster) {
       if (clusterId) {
         clusterStore.setActive(clusterId)
-        navigate(clusterViewURL({ params: { clusterId } }));
       } else {
         clusterStore.setActive(null) 
         if (redirectToLanding) {
diff --git a/src/renderer/components/+workspaces/workspace-menu.tsx b/src/renderer/components/+workspaces/workspace-menu.tsx
index 39eafaa199..fb415fa5ea 100644
--- a/src/renderer/components/+workspaces/workspace-menu.tsx
+++ b/src/renderer/components/+workspaces/workspace-menu.tsx
@@ -10,6 +10,8 @@ import { observable } from "mobx";
 import { workspaceStore, WorkspaceId } from "../../../common/workspace-store";
 import { cssNames } from "../../utils";
 import { clusterStore } from "../../../common/cluster-store";
+import { navigate } from "../../navigation";
+import { clusterViewURL } from "../cluster-manager/cluster-view.route";
 
 interface Props extends Partial<MenuProps> {
 }
@@ -23,6 +25,8 @@ export class WorkspaceMenu extends React.Component<Props> {
       workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId);
     }
     workspaceStore.setActive(id);
+    const clusterId = workspaceStore.currentWorkspace.lastActiveClusterId;
+    navigate(clusterViewURL({ params: { clusterId } }));
   }
 
   render() {