diff --git a/src/zen/sessionstore/ZenSessionManager.sys.mjs b/src/zen/sessionstore/ZenSessionManager.sys.mjs
index a559ccf2a..aeed984ca 100644
--- a/src/zen/sessionstore/ZenSessionManager.sys.mjs
+++ b/src/zen/sessionstore/ZenSessionManager.sys.mjs
@@ -301,11 +301,14 @@ export class nsZenSessionManager {
     }
     if (!initialState?.windows?.length) {
       initialState ||= {};
-      initialState.windows = [
-        {
-          tabs: [],
-        },
-      ];
+      let lastSessionState = initialState.lastSessionState || {};
+      initialState.windows = lastSessionState.windows?.length
+        ? [...lastSessionState.windows]
+        : [
+            {
+              tabs: [],
+            },
+          ];
     }
     for (const winData of initialState?.windows || []) {
       winData.spaces = this._migrationData?.spaces || [];