diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 92eea4991..0b78e8359 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -748,13 +748,13 @@ class nsZenWorkspaces {
   }
 
   set activeWorkspace(value) {
-    if (value === this.#activeWorkspace) {
-      return;
-    }
     const spaces = this.getWorkspaces();
     if (!spaces.some((ws) => ws.uuid === value)) {
       value = spaces[0]?.uuid || '';
     }
+    if (value === this.#activeWorkspace) {
+      return;
+    }
     this.#activeWorkspace = value;
     if (this.privateWindowOrDisabled) {
       return;
@@ -851,6 +851,9 @@ class nsZenWorkspaces {
   }
 
   async restoreWorkspacesFromSessionStore(aWinData = {}) {
+    if (this.#hasInitialized) {
+      return;
+    }
     this._workspaceCache = aWinData.spaces?.length
       ? aWinData.spaces
       : [await this.createAndSaveWorkspace('Space', undefined, true)];