diff --git a/src/tabbar/_tabs_on_bottom.scss b/src/tabbar/_tabs_on_bottom.scss
index 6b30462..18a7448 100644
--- a/src/tabbar/_tabs_on_bottom.scss
+++ b/src/tabbar/_tabs_on_bottom.scss
@@ -115,12 +115,10 @@ See the above repository for updates as well as full license text. */
 }
 :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
   --uc-window-control-width: 84px; /* 84px is default value of linux */
+  --uc-window-drag-space-pre: 30px;
   --uc-window-drag-space-post: 25px;
 }
-:root[tabsintitlebar] {
-  --uc-window-drag-space-pre: 30px;
-}
-:root[tabsintitlebar][sizemode="maximized"] {
+:root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
   --uc-window-drag-space-pre: 0px; /* Remove pre space */
 }
 
@@ -202,6 +200,9 @@ See the above repository for updates as well as full license text. */
     width: 100%;
     overflow: hidden;
   }
+  :root[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) {
+    height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */
+  }
 
   #toolbar-menubar > .titlebar-buttonbox-container {
     height: 100%;
@@ -221,7 +222,14 @@ See the above repository for updates as well as full license text. */
     --toolbarbutton-inner-padding: 3px;
   }
 
-  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) #TabsToolbar > .titlebar-buttonbox-container {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
     height: var(--uc-menubar-container-height);
   }
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-buttonbox-container{
+    visibility: collapse !important;
+  }
+  :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: visible;
+  }
 }
diff --git a/userChrome.css b/userChrome.css
index 42d05ef..827bed7 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -3613,14 +3613,11 @@
   :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
     --uc-window-control-width: 84px;
     /* 84px is default value of linux */
+    --uc-window-drag-space-pre: 30px;
     --uc-window-drag-space-post: 25px;
   }
 
-  :root[tabsintitlebar] {
-    --uc-window-drag-space-pre: 30px;
-  }
-
-  :root[tabsintitlebar][sizemode="maximized"] {
+  :root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
     --uc-window-drag-space-pre: 0px;
     /* Remove pre space */
   }
@@ -3709,6 +3706,11 @@
       overflow: hidden;
     }
 
+    :root[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) {
+      height: var(--uc-menubar-height) !important;
+      /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */
+    }
+
     #toolbar-menubar > .titlebar-buttonbox-container {
       height: 100%;
       order: 100;
@@ -3728,9 +3730,23 @@
       --toolbarbutton-inner-padding: 3px;
     }
 
-    :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) #TabsToolbar > .titlebar-buttonbox-container {
+    #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+    #TabsToolbar > .titlebar-buttonbox-container {
       height: var(--uc-menubar-container-height);
     }
+
+    :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+      #toolbar-menubar:not([autohide="true"])
+      + #TabsToolbar
+      > .titlebar-buttonbox-container {
+      visibility: collapse !important;
+    }
+
+    :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"])
+      #toolbar-menubar:not([autohide="true"])
+      .titlebar-buttonbox-container {
+      visibility: visible;
+    }
   }
 }
 /*= Tab Bar - Connect to window ==============================================*/