Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 17543)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 17545)
@@ -1043,5 +1043,5 @@
                 Logging.log(Logging.LEVEL_ERROR, null, e);
             }
-        } else {
+        } else if (PlatformManager.isPlatformOsx() && Utils.getJavaVersion() < 16) {
             // Workaround for JDK-8251377: JTabPanel active tab is unreadable in Big Sur, see #20075
             // os.version will return 10.16, or 11.0 depending on environment variable
@@ -1049,5 +1049,5 @@
             final String laf = UIManager.getLookAndFeel().getID();
             final String macOSVersion = getSystemProperty("os.version");
-            if (PlatformManager.isPlatformOsx() && (laf.contains("Mac") || laf.contains("Aqua"))
+            if ((laf.contains("Mac") || laf.contains("Aqua"))
                     && (macOSVersion.startsWith("10.16") || macOSVersion.startsWith("11"))) {
                 UIManager.put("TabbedPane.foreground", Color.BLACK);