--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -45,34 +45,34 @@
    * the titlebar */
   #browser {
     -moz-appearance: -moz-win-exclude-glass;
   }
 
   @media not all and (-moz-os-version: windows-win7) {
     @media not all and (-moz-os-version: windows-win8) {
       @media (-moz-windows-default-theme) {
+        :root:not(:-moz-lwtheme) {
+          background-color: hsl(0, 0%, 78%);
+        }
+
 %ifdef MOZ_PHOTON_THEME
         @media (-moz-windows-accent-color-applies: 0) {
-          :root:not(:-moz-lwtheme) {
+          :root[tabsintitlebar]:not(:-moz-lwtheme) {
             background-color: hsl(235,33%,19%);
             --titlebar-text-color: hsl(240,9%,98%);
           }
         }
 
         @media (-moz-windows-accent-color-applies) {
-          :root:not(:-moz-window-inactive):not(:-moz-lwtheme) {
+          :root[tabsintitlebar]:not(:-moz-window-inactive):not(:-moz-lwtheme) {
             background-color: -moz-win-accentcolor;
             --titlebar-text-color: -moz-win-accentcolortext;
           }
         }
-%else
-        :root:not(:-moz-lwtheme) {
-          background-color: hsl(0, 0%, 78%);
-        }
 %endif
 
         :root[tabsintitlebar] .tab-label:-moz-window-inactive {
           /* Calculated to match the opacity change of Windows Explorer
              titlebar text change for inactive windows. */
           opacity: .6;
         }
       }