diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e2c5d4927..1b52a7aff 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -254,7 +254,8 @@ var gZenVerticalTabsManager = {
       tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
     }
 
-    this._insertDoubleClickListenerPinnedTabs();
+    //this._insertDoubleClickListenerPinnedTabs();
+    gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
   openNewTabOnTabsMiddleClick(event) {
@@ -629,12 +630,12 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  _insertDoubleClickListenerPinnedTabs() {
-    const tabs = gBrowser.tabs;
-    for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-    }
-  },
+  //_insertDoubleClickListenerPinnedTabs() {
+  //  const tabs = gBrowser.tabs;
+  //  for (const tab of tabs) {
+  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
+  //  }
+  //},
 
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
@@ -675,7 +676,7 @@ var gZenVerticalTabsManager = {
   renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned) {
       this._tabEdited = null;
       return;
     }