diff --git a/__tests__/native_menu.test.scss b/__tests__/native_menu.test.scss
index 38d96d4..71dd77b 100644
--- a/__tests__/native_menu.test.scss
+++ b/__tests__/native_menu.test.scss
@@ -12,6 +12,7 @@
         @include native_menu.NativeToolkitMenu {
           @include example;
         }
+
         @include native_menu.NativeMenuPopup {
           @include example;
         }
@@ -20,6 +21,7 @@
         @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
           @include example;
         }
+
         menupopup:is(#historyMenuPopup, #bookmarksMenuPopup),
         menupopup:not([placespopup="true"]) {
           @include example;
@@ -33,12 +35,15 @@
         @include native_menu.NativeMenu(true) {
           @include example;
         }
+
         @include native_menu.NonNativeMenu(true) {
           @include example;
         }
+
         @include native_menu.WinNativeMenu(true) {
           @include example;
         }
+
         @include native_menu.WinNonNativeMenu(true) {
           @include example;
         }
@@ -54,6 +59,7 @@
             @include example;
           }
         }
+
         @media (-moz-windows-non-native-menus) {
           @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
             @include example;
@@ -64,11 +70,13 @@
             @include example;
           }
         }
+
         @media not (-moz-windows-non-native-menus) {
           @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
             @include example;
           }
         }
+
         @media (-moz-windows-non-native-menus) {
           @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
             @include example;
@@ -83,12 +91,15 @@
         @include native_menu.NativeMenu {
           @include example;
         }
+
         @include native_menu.NonNativeMenu {
           @include example;
         }
+
         @include native_menu.WinNativeMenu {
           @include example;
         }
+
         @include native_menu.WinNonNativeMenu {
           @include example;
         }
@@ -102,6 +113,7 @@
             @include example;
           }
         }
+
         @media (-moz-windows-non-native-menus) {
           @include example;
         }
@@ -110,9 +122,11 @@
             @include example;
           }
         }
+
         @media not (-moz-windows-non-native-menus) {
           @include example;
         }
+
         @media (-moz-windows-non-native-menus) {
           @include example;
         }
@@ -130,6 +144,7 @@
         @include native_menu.NativeToolkitMenu {
           @include example;
         }
+
         @include native_menu.NativeMenuPopup {
           @include example;
         }
@@ -138,6 +153,7 @@
         @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
           @include example;
         }
+
         menupopup:is(#historyMenuPopup, #bookmarksMenuPopup),
         menupopup:not([placespopup="true"]) {
           @include example;
@@ -151,46 +167,41 @@
         @include native_menu.NativeMenu(true) {
           @include example;
         }
+
         @include native_menu.NonNativeMenu(true) {
           @include example;
         }
+
         @include native_menu.WinNativeMenu(true) {
           @include example;
         }
+
         @include native_menu.WinNonNativeMenu(true) {
           @include example;
         }
       }
       @include expect {
-        @media not (-moz-windows-non-native-menus) {
-          @media (-moz-platform: windows) {
-            @include example;
-          }
-        }
         @supports not -moz-bool-pref("userChrome.theme.non_native_menu") {
           @media (-moz-gtk-csd-available) {
             @include example;
           }
         }
-        @media (-moz-windows-non-native-menus) {
-          @media (-moz-platform: windows) {
-            @include example;
-          }
+
+        // Only Windows
+        @media (-moz-platform: windows) {
+          @include example;
         }
         @supports -moz-bool-pref("userChrome.theme.non_native_menu") {
           @media (-moz-gtk-csd-available) {
             @include example;
           }
         }
-        @media not (-moz-windows-non-native-menus) {
-          @media (-moz-platform: windows) {
-            @include example;
-          }
-        }
-        @media (-moz-windows-non-native-menus) {
-          @media (-moz-platform: windows) {
-            @include example;
-          }
+
+        // IGNORE
+
+        // Only Windows
+        @media (-moz-platform: windows) {
+          @include example;
         }
       }
     }
@@ -201,26 +212,28 @@
         @include native_menu.NativeMenu {
           @include example;
         }
+
         @include native_menu.NonNativeMenu {
           @include example;
         }
+
         @include native_menu.WinNativeMenu {
           @include example;
         }
+
         @include native_menu.WinNonNativeMenu {
           @include example;
         }
       }
       @include expect {
-        @media not (-moz-windows-non-native-menus) {
-          @include example;
-        }
         @supports not -moz-bool-pref("userChrome.theme.non_native_menu") {
           @media (-moz-gtk-csd-available) {
             @include example;
           }
         }
-        @media (-moz-windows-non-native-menus) {
+
+        // AS Windows
+        @media (-moz-platform: windows) {
           @include example;
         }
         @supports -moz-bool-pref("userChrome.theme.non_native_menu") {
@@ -228,10 +241,11 @@
             @include example;
           }
         }
-        @media not (-moz-windows-non-native-menus) {
-          @include example;
-        }
-        @media (-moz-windows-non-native-menus) {
+
+        // IGNORE
+
+        // AS Windows
+        @media (-moz-platform: windows) {
           @include example;
         }
       }
diff --git a/src/utils/_native_menu.scss b/src/utils/_native_menu.scss
index 24e8e2b..e7dab8e 100644
--- a/src/utils/_native_menu.scss
+++ b/src/utils/_native_menu.scss
@@ -26,10 +26,8 @@
 }
 
 @mixin NativeMenu($win-media: false) {
-  @media not (-moz-windows-non-native-menus) {
-    @include _WinMedia($win-media) {
-      @content;
-    }
+  @include WinNativeMenu($win-media) {
+    @content;
   }
   @include NotOption("userChrome.theme.non_native_menu") {
     @include OS($linux) {
@@ -38,12 +36,9 @@
   }
 }
 
-
 @mixin NonNativeMenu($win-media: false) {
-  @media (-moz-windows-non-native-menus) {
-    @include _WinMedia($win-media) {
-      @content;
-    }
+  @include WinNonNativeMenu($win-media) {
+    @content;
   }
   @include Option("userChrome.theme.non_native_menu") {
     @include OS($linux) {
@@ -53,16 +48,24 @@
 }
 
 @mixin WinNativeMenu($win-media: false) {
-  @media not (-moz-windows-non-native-menus) {
-    @include _WinMedia($win-media) {
-      @content;
+  @if $osESR {
+    @media not (-moz-windows-non-native-menus) {
+      @include _WinMedia($win-media) {
+        @content;
+      }
     }
   }
 }
 
 @mixin WinNonNativeMenu($win-media: false) {
-  @media (-moz-windows-non-native-menus) {
-    @include _WinMedia($win-media) {
+  @if $osESR {
+    @media (-moz-windows-non-native-menus) {
+      @include _WinMedia($win-media) {
+        @content;
+      }
+    }
+  } @else {
+    @include _WinMedia(true) {
       @content;
     }
   }