diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index ebcf9999f..2592e1c55 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -139,6 +139,9 @@
     }
 
     rename() {
+      if (!gZenVerticalTabsManager._hasSetSingleToolbar) {
+        return;
+      }
       gZenVerticalTabsManager.renameTabStart({
         target: this.labelElement,
         explicit: true,
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index cd1bc05e7..a1a3ec03b 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -74,6 +74,11 @@
           folder = target.group;
         } else if (gBrowser.isTabGroupLabel(target.parentElement)) {
           folder = target.parentElement.group;
+        } else if (
+          target.parentElement?.isZenFolder &&
+          target?.classList.contains('tab-group-label-container')
+        ) {
+          folder = target.parentElement;
         }
 
         // We only want to rename zen-folders as firefox groups don't work well with this
diff --git a/src/zen/folders/zen-folders.css b/src/zen/folders/zen-folders.css
index d3de447a4..c04aa8f57 100644
--- a/src/zen/folders/zen-folders.css
+++ b/src/zen/folders/zen-folders.css
@@ -470,3 +470,9 @@ zen-folder {
 .tab-group-overflow-count-container {
   display: none !important;
 }
+
+:root:not([zen-sidebar-expanded]) {
+  & #context_zenFolderRename {
+    display: none !important;
+  }
+}
diff --git a/surfer.json b/surfer.json
index b8cfcca7c..dbfff0212 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.15b",
+        "displayVersion": "1.15.1b",
         "github": {
           "repo": "zen-browser/desktop"
         },