diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
index 6dd4e4f2c..db6635453 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
@@ -45,7 +45,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
-        FRFont frFont = freeButton.getFont();
+        FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
         freeButton.setFont(frFontPane.update(frFont));
         return freeButton;
     }