diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 9245926029..a9c4350dd1 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -71,7 +71,7 @@ export class AddCluster extends React.Component {
   }
 
   @action
-  refreshContexts() {
+  refreshContexts(autoSelect = true) {
     this.selectedContexts.clear();
     this.kubeContexts.clear();
 
@@ -91,6 +91,12 @@ export class AddCluster extends React.Component {
       }
       break;
     }
+    if (autoSelect) {
+      const allContexts = Array.from(this.kubeContexts.keys());
+      if (allContexts.length <= 10) {
+        this.selectedContexts.replace(allContexts);
+      }
+    }
   }
 
   getContexts(config: KubeConfig): Map<string, KubeConfig> {
diff --git a/src/renderer/components/layout/main-layout.tsx b/src/renderer/components/layout/main-layout.tsx
index c81a42cb4a..def55961fa 100755
--- a/src/renderer/components/layout/main-layout.tsx
+++ b/src/renderer/components/layout/main-layout.tsx
@@ -48,11 +48,14 @@ export class MainLayout extends React.Component<Props> {
     const { className, contentClass, headerClass, tabs, footer, footerClass, children } = this.props;
     const routePath = navigation.location.pathname;
     const cluster = getHostedCluster();
+    if (!cluster) {
+      return null; // fix: skip render when removing active (visible) cluster
+    }
     return (
       <div className={cssNames("MainLayout", className)}>
         <header className={cssNames("flex gaps align-center", headerClass)}>
           <span className="cluster">
-            {cluster.preferences?.clusterName || cluster.contextName}
+            {cluster.preferences.clusterName || cluster.contextName}
           </span>
         </header>