diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx
index 59b047abbb..6c40e22ee9 100644
--- a/src/renderer/components/cluster-manager/cluster-view.tsx
+++ b/src/renderer/components/cluster-manager/cluster-view.tsx
@@ -67,6 +67,7 @@ export class ClusterView extends React.Component<Props> {
 
   componentWillUnmount() {
     refreshViews();
+    catalogEntityRegistry.activeEntity = null;
   }
 
   bindEvents() {