diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 69e5b1b..dea6392 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -4633,7 +4633,7 @@
       }
     }
     @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-      @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
+      @supports -moz-bool-pref("userChrome.tabbar.on_bottom") or -moz-bool-pref("userChrome.hidden.tabbar") {
         @media screen and (max-width: 1100px) {
           /*= Windows Control - Move to toolbar ========================================*/
           /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
@@ -4983,7 +4983,7 @@
     }
     @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
       @media screen and (max-width: 1100px) {
-        @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
+        @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") or not -moz-bool-pref("userChrome.hidden.tabbar") {
           :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
             /* Don't need pre spacer */
             --uc-window-drag-space-pre: 0px;
@@ -5028,7 +5028,7 @@
       }
     }
     @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
-      @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
+      @supports -moz-bool-pref("userChrome.tabbar.on_bottom") or -moz-bool-pref("userChrome.hidden.tabbar") {
         @media screen and (max-width: 1100px) {
           #nav-bar {
             border-inline-start-width: var(--uc-window-drag-space-pre);
@@ -5092,7 +5092,7 @@
         }
       }
       @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
-        @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
+        @supports -moz-bool-pref("userChrome.tabbar.on_bottom") or -moz-bool-pref("userChrome.hidden.tabbar") {
           @media screen and (max-width: 1100px) {
             :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
               border-inline-start-width: var(--uc-widow-control-space);
@@ -6713,8 +6713,19 @@
     --uc-bm-hide-height: calc(-1 * var(--uc-bm-height));
   }
   @supports -moz-bool-pref("userChrome.hidden.tabbar") {
-    :root {
-      --uc-tabbar-height: 0px;
+    @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+      :root {
+        --uc-tabbar-height: 0px;
+      }
+    }
+    @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
+      @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
+        @media screen and (max-width: 1100px) {
+          :root {
+            --uc-tabbar-height: 0px;
+          }
+        }
+      }
     }
   }
   @supports -moz-bool-pref("userChrome.hidden.navbar") {
@@ -7215,21 +7226,28 @@
   }
 }
 /** Hidden ********************************************************************/
-@supports -moz-bool-pref("userChrome.hidden.tabbar") {
-  #TabsToolbar {
-    display: none !important;
+@supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+  @supports -moz-bool-pref("userChrome.hidden.tabbar") {
+    #TabsToolbar {
+      display: none !important;
+    }
   }
-}
-@supports -moz-bool-pref("userChrome.hidden.navbar") {
-  @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+  @supports -moz-bool-pref("userChrome.hidden.navbar") {
     #nav-bar {
       visibility: collapse;
       /* display: none is not work */
     }
   }
-  @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
-    @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-      @media screen and (max-width: 1100px) {
+}
+@supports -moz-bool-pref("userChrome.tabbar.one_liner") {
+  @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
+    @media screen and (max-width: 1100px) {
+      @supports -moz-bool-pref("userChrome.hidden.tabbar") {
+        #TabsToolbar {
+          display: none !important;
+        }
+      }
+      @supports -moz-bool-pref("userChrome.hidden.navbar") {
         #nav-bar {
           visibility: collapse;
           /* display: none is not work */
diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss
index 3ddf4ad..2212c5f 100644
--- a/src/autohide/_common.scss
+++ b/src/autohide/_common.scss
@@ -8,7 +8,9 @@
     --uc-bm-hide-height: calc(-1 * var(--uc-bm-height));
 
     @include Option("userChrome.hidden.tabbar") {
-      --uc-tabbar-height: 0px;
+      @include OneLinerNavbarContent() {
+        --uc-tabbar-height: 0px;
+      }
     }
     @include Option("userChrome.hidden.navbar") {
       --uc-navbar-height: 0px;
diff --git a/src/hidden/_index.scss b/src/hidden/_index.scss
index 070be4c..631c162 100644
--- a/src/hidden/_index.scss
+++ b/src/hidden/_index.scss
@@ -1,11 +1,11 @@
-@include Option("userChrome.hidden.tabbar") {
-  #TabsToolbar {
-    display: none !important;
+@include OneLinerNavbarContent() {
+  @include Option("userChrome.hidden.tabbar") {
+    #TabsToolbar {
+      display: none !important;
+    }
   }
-}
 
-@include Option("userChrome.hidden.navbar") {
-  @include OneLinerNavbarContent() {
+  @include Option("userChrome.hidden.navbar") {
     #nav-bar {
       visibility: collapse; /* display: none is not work */
     }
diff --git a/src/tabbar/_layout.scss b/src/tabbar/_layout.scss
index 99a8b8f..b6fed2c 100644
--- a/src/tabbar/_layout.scss
+++ b/src/tabbar/_layout.scss
@@ -10,7 +10,7 @@
     }
   }
   @include Option("userChrome.tabbar.one_liner.responsive") {
-    @include Option("userChrome.tabbar.on_bottom") {
+    @include Option("userChrome.tabbar.on_bottom", "userChrome.hidden.tabbar") {
       @media screen and (max-width: 1100px) {
         @import "layout/window_control";
       }
diff --git a/src/tabbar/layout/_navbar_padding.scss b/src/tabbar/layout/_navbar_padding.scss
index 3196815..9ac3d62 100644
--- a/src/tabbar/layout/_navbar_padding.scss
+++ b/src/tabbar/layout/_navbar_padding.scss
@@ -46,7 +46,7 @@
       @content;
     }
     @include NotOption("userChrome.tabbar.one_liner.combine_navbar") {
-      @include Option("userChrome.tabbar.on_bottom") {
+      @include Option("userChrome.tabbar.on_bottom", "userChrome.hidden.tabbar") {
         @media screen and (max-width: 1100px) {
           @content;
         }
@@ -74,7 +74,7 @@
     }
     @include Option("userChrome.tabbar.one_liner.responsive") {
       @media screen and (max-width: 1100px) {
-        @include NotOption("userChrome.tabbar.on_bottom") {
+        @include NotOption("userChrome.tabbar.on_bottom", "userChrome.hidden.tabbar") {
           @include _remove_spacer_pre;
           @include _remove_spacer_post;
         }