modules/javafx.controls/src/main/java/javafx/scene/control/skin/MenuBarSkin.java

@@ -864,11 +864,12 @@
                                      if (currentMenuBarStage == stage) {
                                          currentMenuBarStage = null;
                                          setSystemMenu(stage);
                                      }
                                  } else {
-                                     if (curMBSkin != null && curMBSkin.getSkinnable() != null &&
+                                     if (getSkinnable().isUseSystemMenuBar() &&
+                                             curMBSkin != null && curMBSkin.getSkinnable() != null &&
                                              curMBSkin.getSkinnable().isUseSystemMenuBar()) {
                                          curMBSkin.getSkinnable().setUseSystemMenuBar(false);
                                      }
                                  }
                              }