diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
index 2cfc721e5c..7fa1efbe80 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
@@ -61,8 +61,10 @@ public class NormalButtonSettingPane<T extends Widget> extends BaseStyleSettingP
             styleSettingHead.setSelectedIndex(0);
         } else {
             styleSettingHead.setSelectedIndex(1);
-            lineComboBox.setSelectedLineStyle(widgetTheme.getBorderStyle().getLineType());
-            borderRadiusSpinner.setValue(widgetTheme.getBorderStyle().getRadius());
+            BorderStyle borderStyle = widgetTheme.getBorderStyle();
+            lineComboBox.setSelectedLineStyle(borderStyle.getLineType());
+            borderRadiusSpinner.setValue(borderStyle.getRadius());
+            borderColorSelectBox.setSelectObject(borderStyle.getBorderColor());
             assignFontPane(widgetTheme);
             buttonStyleDefinedPane.populate(ButtonBackground.create(widgetTheme.getButtonBackgroundStyle()));
         }