diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java
index c15a504d7e..b651b9373b 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java
@@ -217,7 +217,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         setLineComboBox(widgetStyle);
         setBorderRadiusSpinner(widgetStyle);
         setTextStylePane(widgetStyle);
-        setFrFontPane();
+        setFrFontPane(widgetStyle);
         setButtonStyleDefinedPane(widgetStyle);
         setSelectBgColor(widgetStyle);
     }
@@ -257,9 +257,9 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         this.fontColorButton.setColor(textStyle.getFontColor());
     }
 
-    private void setFrFontPane() {
+    private void setFrFontPane(ThemedWidgetStyle widgetStyle) {
         if (frFontPane != null) {
-            frFontPane.populateBean(FRFont.getInstance());
+            frFontPane.populateBean(widgetStyle.getFontStyle().getFont());
         }
     }