From 7ddace35f99210a3675b9f20b589366c4f9785a9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 16 Dec 2025 22:15:14 +0100
Subject: [PATCH] fix: Default assign an array instead of an object to the
 workspaces cache, b=no-bug, c=workspaces

---
 src/zen/sessionstore/ZenWindowSync.sys.mjs | 5 +++--
 src/zen/workspaces/ZenWorkspaces.mjs       | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/zen/sessionstore/ZenWindowSync.sys.mjs b/src/zen/sessionstore/ZenWindowSync.sys.mjs
index c5eef9f15..e0b0b79d9 100644
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -784,7 +784,7 @@ class nsZenWindowSync {
     );
     const selectedTab = aWindow.gBrowser.selectedTab;
     let win = [...this.#browserWindows][0];
-    const moveAllTabsToWindow = (allowSelected = false) => {
+    const moveAllTabsToWindow = async (allowSelected = false) => {
       const { gBrowser, gZenWorkspaces } = win;
       win.focus();
       let success = true;
@@ -804,7 +804,8 @@ class nsZenWindowSync {
       }
       if (success) {
         aWindow.close();
-        win.gBrowser.selectedTab.linkedBrowser.focus();
+        await gZenWorkspaces.changeWorkspaceWithID(aWorkspaceId);
+        gBrowser.selectedBrowser.focus();
       }
     };
     if (!win) {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 2c44c0b29..9b3941cc9 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -23,7 +23,7 @@ class nsZenWorkspaces {
     direction: null,
   };
 
-  _workspaceCache = {};
+  _workspaceCache = [];
 
   #lastScrollTime = 0;
 
@@ -806,7 +806,7 @@ class nsZenWorkspaces {
 
   getWorkspaceFromId(id) {
     try {
-      return this._workspaceCache.find((workspace) => workspace.uuid === id);
+      return this.getWorkspaces().find((workspace) => workspace.uuid === id);
     } catch {
       return null;
     }