--- old/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java	2020-07-11 17:35:35.070000000 +0900
+++ new/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java	2020-07-11 17:35:35.000000000 +0900
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,9 +166,12 @@
     private String findFontWithCharset(FontDescriptor[] fontDescriptors, String charset) {
         String fontName = null;
         for (int i = 0; i < fontDescriptors.length; i++) {
-            String componentFontName = fontDescriptors[i].getNativeName();
-            if (componentFontName.endsWith(charset)) {
+            FontDescriptor desc = fontDescriptors[i];
+            String componentFontName = desc.getNativeName();
+            if ((desc.isDefaultFont() && charset.equals("DEFAULT_CHARSET")) ||
+                componentFontName.endsWith(charset)) {
                 fontName = componentFontName;
+                break;
             }
         }
         return fontName;