diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts
index 302317e52e..1a72ff0816 100644
--- a/src/main/cluster-manager.ts
+++ b/src/main/cluster-manager.ts
@@ -1,5 +1,6 @@
 import "../common/cluster-ipc";
 import type http from "http"
+import { ipcMain } from "electron"
 import { autorun } from "mobx";
 import { clusterStore, getClusterIdFromHost } from "../common/cluster-store"
 import { Cluster } from "./cluster"
@@ -30,6 +31,29 @@ export class ClusterManager {
     }, {
       delay: 250
     });
+
+    ipcMain.on("network:offline", () => { this.onNetworkOffline() })
+    ipcMain.on("network:online", () => { this.onNetworkOnline() })
+  }
+
+  protected onNetworkOffline() {
+    logger.info("[CLUSTER-MANAGER]: network is offline")
+    clusterStore.clustersList.forEach((cluster) => {
+      if (!cluster.disconnected) {
+        cluster.online = false
+        cluster.accessible = false
+        cluster.refreshConnectionStatus().catch((e) => e)
+      }
+    })
+  }
+
+  protected onNetworkOnline() {
+    logger.info("[CLUSTER-MANAGER]: network is online")
+    clusterStore.clustersList.forEach((cluster) => {
+      if (!cluster.disconnected) {
+        cluster.refreshConnectionStatus().catch((e) => e)
+      }
+    })
   }
 
   stop() {
diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index ad87a1ca0f..a0f5d7a7a2 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -61,7 +61,7 @@ export class Cluster implements ClusterModel {
   @observable accessible = false;
   @observable ready = false;
   @observable reconnecting = false;
-  @observable disconnected = true;
+  @observable disconnected = true; // false if user has selected to connect
   @observable failureReason: string;
   @observable nodes = 0;
   @observable version: string;
diff --git a/src/renderer/api/kube-watch-api.ts b/src/renderer/api/kube-watch-api.ts
index 464b785dfb..56c3fc1c86 100644
--- a/src/renderer/api/kube-watch-api.ts
+++ b/src/renderer/api/kube-watch-api.ts
@@ -109,17 +109,22 @@ export class KubeWatchApi {
     }
   }
 
-  protected async onRouteEvent({ type, url }: IKubeWatchRouteEvent) {
-    if (type === "STREAM_END") {
+  protected async onRouteEvent(event: IKubeWatchRouteEvent) {
+    if (event.type === "STREAM_END") {
       this.disconnect();
-      const { apiBase, namespace } = KubeApi.parseApi(url);
+      const { apiBase, namespace } = KubeApi.parseApi(event.url);
       const api = apiManager.getApi(apiBase);
       if (api) {
         try {
           await api.refreshResourceVersion({ namespace });
           this.reconnect();
         } catch (error) {
-          console.debug("failed to refresh resource version", error)
+          console.error("failed to refresh resource version", error)
+          if (this.subscribers.size > 0) {
+            setTimeout(() => {
+              this.onRouteEvent(event)
+            }, 1000)
+          }
         }
       }
     }
diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx
index aee156ff31..d13d73ee26 100755
--- a/src/renderer/components/app.tsx
+++ b/src/renderer/components/app.tsx
@@ -46,6 +46,9 @@ export class App extends React.Component {
     await Terminal.preloadFonts()
     await clusterIpc.setFrameId.invokeFromRenderer(clusterId, frameId);
     await getHostedCluster().whenReady; // cluster.activate() is done at this point
+    window.addEventListener("online", () => {
+      window.location.reload()
+    })
   }
 
   get startURL() {
diff --git a/src/renderer/lens-app.tsx b/src/renderer/lens-app.tsx
index 9b4fffc6a1..70b992a910 100644
--- a/src/renderer/lens-app.tsx
+++ b/src/renderer/lens-app.tsx
@@ -1,5 +1,6 @@
 import "../common/system-ca"
 import React from "react";
+import { ipcRenderer } from "electron";
 import { Route, Router, Switch } from "react-router";
 import { observer } from "mobx-react";
 import { userStore } from "../common/user-store";
@@ -14,6 +15,15 @@ import { ConfirmDialog } from "./components/confirm-dialog";
 
 @observer
 export class LensApp extends React.Component {
+  static async init() {
+    window.addEventListener("offline", () => {
+      ipcRenderer.send("network:offline")
+    })
+    window.addEventListener("online", () => {
+      ipcRenderer.send("network:online")
+    })
+  }
+
   render() {
     return (
       <I18nProvider i18n={_i18n}>