Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

src/zen/folders/ZenFolder.mjs

@@ -139,7 +139,7 @@
     }
 
     rename() {
-      if (!gZenVerticalTabsManager._hasSetSingleToolbar) {
+      if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) {
         return;
       }
       gZenVerticalTabsManager.renameTabStart({

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);

surfer.json

@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.15.1b",
+        "displayVersion": "1.15.2b",
         "github": {
           "repo": "zen-browser/desktop"
         },