diff --git a/chrome/autohide_tabstoolbar_v2.css b/chrome/autohide_tabstoolbar_v2.css
index 493a634..ff68e8a 100644
--- a/chrome/autohide_tabstoolbar_v2.css
+++ b/chrome/autohide_tabstoolbar_v2.css
@@ -68,9 +68,11 @@ See the above repository for updates as well as full license text. */
     transition: visibility 0ms linear var(--uc-tabs-hide-animation-delay),
                 margin-bottom var(--uc-tabs-hide-animation-duration) ease-out var(--uc-tabs-hide-animation-delay) !important;
   }
+  #mainPopupSet:has( > #tab-group-editor > [panelopen]) ~ #navigator-toolbox,
   #navigator-toolbox:has(> :is(#toolbar-menubar,#TabsToolbar):hover),
   #navigator-toolbox[movingtab]{
     transition-delay: 0s !important;
+    margin-bottom: calc(0px - 2 * var(--tab-block-margin) - var(--tab-min-height));
     > #TabsToolbar{
       visibility: visible;
       margin-bottom: 0px;
diff --git a/chrome/autohide_toolbox.css b/chrome/autohide_toolbox.css
index 66afed3..ce70c56 100644
--- a/chrome/autohide_toolbox.css
+++ b/chrome/autohide_toolbox.css
@@ -44,7 +44,7 @@ See the above repository for updates as well as full license text. */
 }
 
 :root[window-modal-open] #urlbar[popover],
-#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel)) ~ toolbox #urlbar[popover],
+#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel), #tab-group-editor > [panelopen]) ~ toolbox #urlbar[popover],
 #navigator-toolbox:is(:hover,:focus-within,[movingtab]) #urlbar[popover],
 #urlbar-container > #urlbar[popover]:is([focused],[open]){
   pointer-events: auto;
@@ -54,7 +54,7 @@ See the above repository for updates as well as full license text. */
 }
 
 :root[window-modal-open] #navigator-toolbox,
-#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel)) ~ toolbox,
+#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel), #tab-group-editor > [panelopen]) ~ toolbox,
 #navigator-toolbox:has(#urlbar:is([open],[focus-within])),
 #navigator-toolbox:is(:hover,:focus-within,[movingtab]){
   transition-delay: 33ms !important;