diff --git a/__tests__/one_liner.test.scss b/__tests__/one_liner.test.scss
index 74b8f96..e59f49d 100644
--- a/__tests__/one_liner.test.scss
+++ b/__tests__/one_liner.test.scss
@@ -100,12 +100,12 @@
         }
       }
       @include expect {
-        @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
-          @include example;
-        }
-        @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
-          @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-            @supports -moz-bool-pref("userChrome.autohide.navbar") {
+        @supports -moz-bool-pref("userChrome.autohide.navbar") {
+          @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+            @include example;
+          }
+          @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
+            @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
               @media screen and (max-width: 1100px) {
                 @include example;
               }
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index bfab5b0..4d68707 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6529,21 +6529,21 @@
             }
           }
         }
-        @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
-          @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
-            #navigator-toolbox:hover {
-              --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
+        @supports -moz-bool-pref("userChrome.autohide.navbar") {
+          @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+            @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:hover {
+                --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
+              }
+            }
+            @supports -moz-bool-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:hover {
+                --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height) + var(--uc-bm-height));
+              }
             }
           }
-          @supports -moz-bool-pref("userChrome.autohide.bookmarkbar") {
-            #navigator-toolbox:hover {
-              --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height) + var(--uc-bm-height));
-            }
-          }
-        }
-        @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
-          @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-            @supports -moz-bool-pref("userChrome.autohide.navbar") {
+          @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
+            @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
               @media screen and (max-width: 1100px) {
                 @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
                   #navigator-toolbox:hover {
@@ -6570,21 +6570,21 @@
         }
       }
       @supports -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref("userChrome.tabbar.one_liner") {
-        @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
-          @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
-            #navigator-toolbox:hover {
-              --uc-toolbar-height: var(--uc-navbar-height);
+        @supports -moz-bool-pref("userChrome.autohide.navbar") {
+          @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+            @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:hover {
+                --uc-toolbar-height: var(--uc-navbar-height);
+              }
+            }
+            @supports -moz-bool-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:hover {
+                --uc-toolbar-height: calc(var(--uc-navbar-height) + var(--uc-bm-height));
+              }
             }
           }
-          @supports -moz-bool-pref("userChrome.autohide.bookmarkbar") {
-            #navigator-toolbox:hover {
-              --uc-toolbar-height: calc(var(--uc-navbar-height) + var(--uc-bm-height));
-            }
-          }
-        }
-        @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
-          @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-            @supports -moz-bool-pref("userChrome.autohide.navbar") {
+          @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
+            @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
               @media screen and (max-width: 1100px) {
                 @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
                   #navigator-toolbox:hover {
@@ -6745,21 +6745,21 @@
     }
   }
   @supports -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref("userChrome.tabbar.one_liner") {
-    @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
-      #nav-bar:not([customizing]) {
-        margin-bottom: var(--uc-navbar-hide-height);
-        opacity: 0;
-        will-change: margin-bottom, opacity;
-      }
+    @supports -moz-bool-pref("userChrome.autohide.navbar") {
+      @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
+        #nav-bar:not([customizing]) {
+          margin-bottom: var(--uc-navbar-hide-height);
+          opacity: 0;
+          will-change: margin-bottom, opacity;
+        }
 
-      #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) {
-        margin-bottom: 0;
-        opacity: 1;
+        #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) {
+          margin-bottom: 0;
+          opacity: 1;
+        }
       }
-    }
-    @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
-      @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-        @supports -moz-bool-pref("userChrome.autohide.navbar") {
+      @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
+        @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
           @media screen and (max-width: 1100px) {
             #nav-bar:not([customizing]) {
               margin-bottom: var(--uc-navbar-hide-height);
diff --git a/src/utils/_one_liner.scss b/src/utils/_one_liner.scss
index 169d0e9..40ae98d 100644
--- a/src/utils/_one_liner.scss
+++ b/src/utils/_one_liner.scss
@@ -47,12 +47,12 @@
 }
 
 @mixin OneLinerNavbar() {
-  @include NotOption("userChrome.tabbar.one_liner") {
-    @content;
-  }
-  @include Option("userChrome.tabbar.one_liner") {
-    @include Option("userChrome.tabbar.one_liner.responsive") {
-      @include Option("userChrome.autohide.navbar") {
+  @include Option("userChrome.autohide.navbar") {
+    @include NotOption("userChrome.tabbar.one_liner") {
+      @content;
+    }
+    @include Option("userChrome.tabbar.one_liner") {
+      @include Option("userChrome.tabbar.one_liner.responsive") {
         @media screen and (max-width: 1100px) {
           @content;
         }