From 89cafdaa0bf54f0e66f9402903ecc221adc0ac62 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Fri, 29 Aug 2025 00:12:02 +0200
Subject: [PATCH] fix: Fixed not being able to rename folders in double
 toolbar, b=no-bug, c=folders

---
 src/zen/folders/ZenFolder.mjs  | 2 +-
 src/zen/folders/ZenFolders.mjs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index 72ae13286..7f2f93c3f 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -139,7 +139,7 @@
     }
 
     rename() {
-      if (!gZenVerticalTabsManager._hasSetSingleToolbar) {
+      if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) {
         return;
       }
       gZenVerticalTabsManager.renameTabStart({
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 63005265a..4b38572d2 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -270,6 +270,7 @@
         gBrowser.pinTab(tab);
         group.addTabs([tab]);
       } else {
+        tab._ignoreUngrouped = true;
         // Otherwise, we must move it to the first tab since it was added in an unpinned state
         gZenWorkspaces._emptyTab.after(tab);
         gBrowser.tabContainer._invalidateCachedTabs();
@@ -279,6 +280,10 @@
     on_TabUngrouped(event) {
       const tab = event.detail;
       const group = event.target;
+      if (tab._ignoreUngrouped) {
+        delete tab._ignoreUngrouped;
+        return;
+      }
       tab.removeAttribute('folder-active');
       if (group.hasAttribute('split-view-group') && tab.hasAttribute('had-zen-pinned-changed')) {
         tab.setAttribute('zen-pinned-changed', true);