--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -110,17 +110,18 @@
  * instead of in the tabs toolbar.
  */
 @media (-moz-os-version: windows-win7) {
   @media (-moz-windows-default-theme) {
     :root:not(:-moz-lwtheme) {
       --tabs-border: #4A4A4F;
     }
 
-    #TabsToolbar:not(:-moz-lwtheme) {
+    #TabsToolbar:not(:-moz-lwtheme),
+    #TabsToolbar:not(:-moz-lwtheme) toolbarbutton[disabled="true"] {
       color: hsl(240,9%,98%);
     }
 
     /* Always show full-height tab separators on tabs with borders. */
     .tabbrowser-tab:not(:-moz-lwtheme)::before {
       border-image: none !important;
     }
 

--- a/browser/themes/windows/compacttheme.css
+++ b/browser/themes/windows/compacttheme.css
@@ -25,27 +25,32 @@
     background: transparent !important;
   }
 }
 
 #toolbar-menubar {
   text-shadow: none !important;
 }
 
-@media (-moz-windows-glass) {
-  /* Always show light toolbar elements on aero glass surface. */
-  #TabsToolbar {
-    color: hsl(240,9%,98%);
-  }
+@media (-moz-os-version: windows-win7) {
+  @media (-moz-windows-default-theme) {
+    /* Always show light toolbar elements on aero surface. */
+    #TabsToolbar,
+    #TabsToolbar toolbarbutton[disabled="true"] {
+      color: hsl(240,9%,98%);
+    }
 
-  /* Keep showing the correct color inside the tabs. */
-  .tabbrowser-tab {
-    color: var(--chrome-color) !important;
+    /* Keep showing the correct color inside the tabs. */
+    .tabbrowser-tab {
+      color: var(--chrome-color) !important;
+    }
   }
+}
 
+@media (-moz-windows-glass) {
   /* Make the menubar text readable on aero glass (copied from browser-aero.css). */
   #toolbar-menubar {
     text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
   }
 
   #main-menubar:not(:-moz-window-inactive) {
     background-color: rgba(255,255,255,.5);
     color: black;