From 32b355595cadca477f8835677e97d779b14b9266 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 2 Mar 2026 18:13:57 +0100
Subject: [PATCH] feat: Correctly assign containers to new live folder tabs,
 b=no-bug, c=folders

---
 src/zen/folders/ZenFolders.mjs                     | 7 ++-----
 src/zen/live-folders/ZenLiveFoldersManager.sys.mjs | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 94b26852d..48df746df 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1709,10 +1709,8 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
           continue;
         }
 
-        if (!itemVisible) {
-          if (!itemsToHide.includes(item)) {
-            itemsToHide.push(item);
-          }
+        if (!itemVisible && !itemsToHide.includes(item)) {
+          itemsToHide.push(item);
         }
       }
     }
@@ -1757,7 +1755,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     }
 
     // Cleanup
-    this.styleCleanup(itemsToHide);
     this.styleCleanup(selectedTabs);
   }
 
diff --git a/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs b/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
index c0a3c8ef5..ac62890a0 100644
--- a/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
+++ b/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
@@ -378,6 +378,14 @@ class nsZenLiveFoldersManager {
       }
     }
 
+    let userContextId = 0;
+    let space = folder.ownerGlobal.gZenWorkspaces.getWorkspaceFromId(
+      folder.getAttribute("zen-workspace-id")
+    );
+    if (space) {
+      userContextId = space.containerTabId || 0;
+    }
+
     // Only add the items that are not already in the folder and was not dismissed by the user
     const newItems = items
       .filter((item) => {
@@ -391,6 +399,7 @@ class nsZenLiveFoldersManager {
           skipAnimation: true,
           noInitialLabel: true,
           lazyTabTitle: item.title,
+          userContextId,
         });
         // createLazyBrowser can't be pinned by default
         this.window.gBrowser.pinTab(tab);