diff --git a/src/common/cluster-store.ts b/src/common/cluster-store.ts
index e4febf532a..efed98d00a 100644
--- a/src/common/cluster-store.ts
+++ b/src/common/cluster-store.ts
@@ -86,6 +86,10 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
     return Array.from(this.clusters.values());
   }
 
+  setActive(id: ClusterId) {
+    this.activeClusterId = id;
+  }
+
   hasClusters() {
     return this.clusters.size > 0;
   }
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index e4adeb8951..fdfe6a1b67 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -33,11 +33,8 @@ export class ClustersMenu extends React.Component<Props> {
   @observable showHint = true;
 
   showCluster = (clusterId: ClusterId) => {
-    if (clusterStore.activeClusterId === clusterId) {
-      navigate("/"); // redirect to index
-    } else {
-      clusterStore.activeClusterId = clusterId;
-    }
+    clusterStore.setActive(clusterId);
+    navigate("/"); // redirect to index
   }
 
   addCluster = () => {
@@ -50,7 +47,10 @@ export class ClustersMenu extends React.Component<Props> {
 
     menu.append(new MenuItem({
       label: _i18n._(t`Settings`),
-      click: () => navigate(clusterSettingsURL())
+      click: () => {
+        clusterStore.setActive(cluster.id);
+        navigate(clusterSettingsURL())
+      }
     }));
     if (cluster.online) {
       menu.append(new MenuItem({