From 281ec6693d6c3600dc2aa1d6a4038770e184f7b5 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 6 Jan 2026 12:35:35 +0100
Subject: [PATCH] feat: Correctly initialize new restored windows, b=no-bug,
 c=no-component

---
 src/zen/sessionstore/ZenSessionManager.sys.mjs | 5 +----
 src/zen/sessionstore/ZenWindowSync.sys.mjs     | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/zen/sessionstore/ZenSessionManager.sys.mjs b/src/zen/sessionstore/ZenSessionManager.sys.mjs
index 745752c72..63dbea4bc 100644
--- a/src/zen/sessionstore/ZenSessionManager.sys.mjs
+++ b/src/zen/sessionstore/ZenSessionManager.sys.mjs
@@ -72,10 +72,6 @@ export class nsZenSessionManager {
       compression: SHOULD_COMPRESS_FILE ? 'lz4' : undefined,
       backupFile,
     });
-
-    lazy.SessionStore.promiseAllWindowsRestored.then(() => {
-      delete this._migrationData;
-    });
   }
 
   log(...args) {
@@ -178,6 +174,7 @@ export class nsZenSessionManager {
       // Save the state to the sidebar object so that it gets written
       // to the session file.
       this.saveState(initialState);
+      delete this._migrationData;
       return;
     }
     // If there are no windows, we create an empty one. By default,
diff --git a/src/zen/sessionstore/ZenWindowSync.sys.mjs b/src/zen/sessionstore/ZenWindowSync.sys.mjs
index 8758f9753..64bfa233a 100644
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -99,7 +99,6 @@ class nsZenWindowSync {
         if (
           window.__SSi &&
           !window.closed &&
-          window.gZenStartup.isReady &&
           !window.gZenWorkspaces?.privateWindowOrDisabled
         ) {
           yield window;