diff --git a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts
index 109ae0f0bc..f81972eae3 100644
--- a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts
+++ b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts
@@ -73,7 +73,7 @@ export const initClusterFrame = ({
       });
     });
 
-    window.onbeforeunload = () => {
+    window.onpagehide = () => {
       logger.info(
         `${logPrefix} Unload dashboard, clusterId=${(hostedCluster.id)}, frameId=${frameRoutingId}`,
       );
diff --git a/packages/core/src/renderer/frames/root-frame/init-root-frame.injectable.ts b/packages/core/src/renderer/frames/root-frame/init-root-frame.injectable.ts
index 8d2c3a43be..1732ef6249 100644
--- a/packages/core/src/renderer/frames/root-frame/init-root-frame.injectable.ts
+++ b/packages/core/src/renderer/frames/root-frame/init-root-frame.injectable.ts
@@ -57,7 +57,7 @@ const initRootFrameInjectable = getInjectable({
 
       registerIpcListeners();
 
-      window.addEventListener("beforeunload", () => {
+      window.addEventListener("pagehide", () => {
         logger.info("[ROOT-FRAME]: Unload app");
 
         unmountRoot();