diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index 844649d40..d39de1d44 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -626,8 +626,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 refreshToolArea();
                 // 停止编辑 恢复浮层展示
                 TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
-                for (TreePath path : treePaths) {
-                    formDesign.stopEditing(path);
+                if (treePaths != null) {
+                    for (TreePath path : treePaths) {
+                        if (path != null) {
+                            formDesign.stopEditing(path);
+                        }
+                    }
                 }
             } else {
                 // 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.