--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -1,35 +1,37 @@
 %if 0
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 %filter substitution
 %define horizontalTabPadding 9px
 
-/* This can't live on the tabbrowser because it's used for the titlebar height, too. */
-:root {
+#titlebar,
+#tabbrowser-tabs {
   --tab-min-height: 33px;
 }
 
+:root[uidensity=compact] #titlebar,
+:root[uidensity=compact] #tabbrowser-tabs {
+  --tab-min-height: 29px;
+}
+
+:root[uidensity=touch] #titlebar,
+:root[uidensity=touch] #tabbrowser-tabs {
+  --tab-min-height: 41px;
+}
+
 #tabbrowser-tabs {
   --tabs-top-border-width: 0px;
   --tab-min-width: 76px;
   --tab-loading-fill: #0A84FF;
 }
 
-:root[uidensity=compact] {
-  --tab-min-height: 29px;
-}
-
-:root[uidensity=touch] {
-  --tab-min-height: 41px;
-}
-
 #tabbrowser-tabs:-moz-lwtheme {
   --tab-line-color: var(--lwt-accent-color);
 }
 
 tabbrowser {
   /* Value for --in-content-page-background in in-content/common.inc.css */
   background-color: #f9f9fa;
 }