From 84ba80bc11c92042ca604d6387db6b2fcc0f6df4 Mon Sep 17 00:00:00 2001
From: Ashvin Jangid <142579833+ashvwinn@users.noreply.github.com>
Date: Sun, 28 Jun 2026 14:10:13 +0530
Subject: [PATCH] no-bug: set last selected workspace tab to background tab
 (gh-14395)

---
 src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs b/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
index 41185019b..7622417d8 100644
--- a/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
+++ b/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
@@ -245,10 +245,6 @@ class nsZenSpaceRoutingManager {
           if (targetWorkspace) {
             workspaces.moveTabToWorkspace(newTab, targetWorkspace.uuid);
 
-            if (inBackground) {
-              return;
-            }
-
             const mostRecentWindow =
               Services.wm.getMostRecentWindow("navigator:browser");
             const isOriginatingWindow = win === mostRecentWindow;
@@ -256,7 +252,10 @@ class nsZenSpaceRoutingManager {
               win.gZenWorkspaces.lastSelectedWorkspaceTabs[
                 targetWorkspace.uuid
               ] = newTab;
-              await win.gZenWorkspaces.changeWorkspace(targetWorkspace);
+
+              if (!inBackground) {
+                await win.gZenWorkspaces.changeWorkspace(targetWorkspace);
+              }
             }
           }
         }