diff --git a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
index 25641340c..d7c9aab40 100644
--- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
+++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
@@ -208,7 +208,9 @@ public class HeaderAreaPane extends JPanel {
             if (isNotSelectables(headerColumnRow)) {
                 SortHeader sortHeader = templateCellElement.getCellExpandAttr().getCellSortAttr().getSortHeader();
                 headerColumnRow = ColumnRow.ERROR;
-                sortHeader.setHeaderArea(headerColumnRow.toString());
+                if (sortHeader != null) {
+                    sortHeader.setHeaderArea(headerColumnRow.toString());
+                }
             } else {
                 handleDisableHeaderCell(templateCellElement);
             }
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
index 486492161..1c50499f7 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
@@ -471,6 +471,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 @Override
                 public void attributeChange() {
                     update();
+                    checkButtonEnabled();
                     fireTargetModified();
                 }
             };