From 16d7caa98f2ecc6481d10e6dea340af40676bcc8 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 5 Apr 2026 10:54:15 +0200
Subject: [PATCH] gh-13093: Fixed double seperator lines in context menu
 (gh-13094)

---
 .../customizableui/ToolbarContextMenu-sys-mjs.patch   | 11 ++++++++++-
 src/zen/compact-mode/ZenCompactMode.mjs               |  3 ++-
 src/zen/folders/ZenFolders.mjs                        |  1 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
index bf9fc9dbb..5cf0f5381 100644
--- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -1,7 +1,16 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index d5fd707b98e4b163a624c97ff4a8f2574e0b0180..32360b11270d9dad4b83229428932e598f69e774 100644
+index d5fd707b98e4b163a624c97ff4a8f2574e0b0180..a3ac939aa9133a678396c16bc6746444a3f3ac1f 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
+@@ -183,7 +183,7 @@ export var ToolbarContextMenu = {
+ 
+     let showTabStripItems = toolbarItem?.id == "tabbrowser-tabs";
+     let isVerticalTabStripMenu =
+-      showTabStripItems && toolbarItem.parentElement.id == "vertical-tabs";
++      showTabStripItems && toolbarItem.parentElement.id == "TabsToolbar-customization-target";
+ 
+     if (aInsertPoint) {
+       aInsertPoint.hidden = isVerticalTabStripMenu;
 @@ -243,10 +243,7 @@ export var ToolbarContextMenu = {
      // Show/hide sidebar and vertical tabs menu items
      let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index ae6424fe3..4d92efe89 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -233,6 +233,7 @@ window.gZenCompactModeManager = {
           <menuitem id="zen-context-menu-compact-mode-hide-both" data-l10n-id="zen-toolbar-context-compact-mode-hide-both" type="radio" />
         </menupopup>
       </menu>
+      <menuseparator />
     `);
 
     const idToAction = {
@@ -247,7 +248,7 @@ window.gZenCompactModeManager = {
       }
     }
 
-    document.getElementById("toolbar-context-customize").before(fragment);
+    document.getElementById("toolbar-context-menu").prepend(fragment);
     this.updateContextMenu();
   },
 
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index f3183c76f..d5a579c4a 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -71,7 +71,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     document.getElementById("context_moveTabToGroup").before(contextMenuItems);
     const contextMenuItemsToolbar = window.MozXULElement.parseXULToFragment(
       `<menuitem id="zen-context-menu-new-folder-toolbar" data-l10n-id="zen-toolbar-context-new-folder"/>
-       <menuseparator />
        <menu data-l10n-id="zen-panel-ui-live-folder-create" id="zen-panel-ui-live-folder-create">
          <menupopup>
            <menuitem