diff --git a/src/main/menu.ts b/src/main/menu.ts
index c820f38e76..09cf33b20f 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -90,7 +90,7 @@ export function buildMenu() {
         label: 'Back',
         accelerator: 'CmdOrCtrl+[',
         click() {
-          webContents.getFocusedWebContents()?.goBack();
+          webContents.getFocusedWebContents()?.goBack(); // fixme: works until second cluster selected
         }
       },
       {
diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx
index 08a053c14e..61d37c89ed 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.tsx
+++ b/src/renderer/components/cluster-manager/cluster-manager.tsx
@@ -70,13 +70,17 @@ export class ClusterManager extends React.Component {
       }),
       reaction(() => [
         getMatchedClusterId(),
-        getMatchedCluster()?.available,
+        getMatchedCluster()?.available, // refresh on disconnect active-cluster
       ], refreshViews, {
         fireImmediately: true
       })
     ])
   }
 
+  componentWillUnmount() {
+    lensViews.clear();
+  }
+
   get startUrl() {
     const { activeClusterId } = clusterStore;
     if (activeClusterId) {