From 1d2a14f9e42a34d9af880af612ea4ec2d28e803f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 17 Feb 2026 22:40:00 +0100
Subject: [PATCH] feat: Correctly calculate size of folder search popup,
 b=no-bug, c=flatpak, folders, workspaces

---
 build/flatpak/app.zen_browser.zen.yml.template | 1 +
 src/zen/folders/ZenFolders.mjs                 | 2 +-
 src/zen/sessionstore/ZenWindowSync.sys.mjs     | 9 ++++-----
 src/zen/workspaces/ZenWorkspaces.mjs           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template
index c28deac8b..64e4717cf 100644
--- a/build/flatpak/app.zen_browser.zen.yml.template
+++ b/build/flatpak/app.zen_browser.zen.yml.template
@@ -25,6 +25,7 @@ finish-args:
   - --filesystem=xdg-run/speech-dispatcher:ro
   - --device=all
   - --talk-name=org.freedesktop.FileManager1
+  - --talk-name=org.freedesktop.Notifications
   - --system-talk-name=org.freedesktop.NetworkManager
   - --talk-name=org.a11y.Bus
   - --talk-name=org.gtk.vfs.*
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index f522c18be..f33cfcc16 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -730,7 +730,7 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
   get #searchPopupOptions() {
     const isRightSide = gZenVerticalTabsManager._prefsRightSide;
     const position = isRightSide ? "start_before" : "start_before";
-    let size = this.#popup.querySelector("#zen-folder-tabs-list").children.length + 1;
+    let size = Math.min(this.#popup.querySelector("#zen-folder-tabs-list").children.length, 6) + 1;
     size *= 48;
     return {
       position,
diff --git a/src/zen/sessionstore/ZenWindowSync.sys.mjs b/src/zen/sessionstore/ZenWindowSync.sys.mjs
index 325068840..4c2acef32 100644
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -815,13 +815,12 @@ class nsZenWindowSync {
         });
 
         let promise = this.#createPseudoImageForBrowser(otherBrowser, mySrc);
+
         await Promise.all([promiseToWait, promise]);
-        aOurTab.ownerGlobal.requestAnimationFrame(() => {
-          otherBrowser.setAttribute("zen-pseudo-hidden", "true");
-          ourBrowser.removeAttribute("zen-pseudo-hidden");
-          this.#maybeRemovePseudoImageForBrowser(ourBrowser);
-        });
         callback();
+        otherBrowser.setAttribute("zen-pseudo-hidden", "true");
+        ourBrowser.removeAttribute("zen-pseudo-hidden");
+        this.#maybeRemovePseudoImageForBrowser(ourBrowser);
       } else {
         ourBrowser.removeAttribute("zen-pseudo-hidden");
         this.#maybeRemovePseudoImageForBrowser(ourBrowser);
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 861a7ae3b..52cd3c798 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -159,7 +159,7 @@ class nsZenWorkspaces {
     }
   }
 
-  async #afterLoadInit() {
+  #afterLoadInit() {
     const onResize = (...args) => {
       requestAnimationFrame(() => {
         this.onPinnedTabsResize(...args);
@@ -918,7 +918,7 @@ class nsZenWorkspaces {
     this.#initializeEmptyTab();
     return (async () => {
       await this.#waitForPromises();
-      await this.#afterLoadInit();
+      this.#afterLoadInit();
       await this.workspaceBookmarks();
       await this.changeWorkspace(activeWorkspace, { onInit: true });
       this.#fixTabPositions();