diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
index 22eeb36890..c7b2412518 100644
--- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java
+++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
@@ -52,6 +52,7 @@ public class ComponentTree extends JTree {
     }
 
     private void initListeners() {
+        this.addTreeSelectionListener(designer);
         ComponetTreeMouseListener componetTreeMouseListener = new ComponetTreeMouseListener(this);
         this.addMouseMotionListener(componetTreeMouseListener);
         this.addMouseListener(componetTreeMouseListener);
diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
index 540dd63c23..c5a27044df 100644
--- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
@@ -111,8 +111,6 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 
 		// 这里要刷新一下，否则控件树中没有任何一个控件处于选中状态
 		refreshComponentTree();
-		// 初始刷新完成后，再加 listener
-		componentTree.addTreeSelectionListener(formDesigner);
 	}
 
 	private void refreshComponentTree() {
diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java
index 30f3f5ca07..01f42d7515 100644
--- a/designer_form/src/com/fr/design/mainframe/JForm.java
+++ b/designer_form/src/com/fr/design/mainframe/JForm.java
@@ -248,6 +248,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
             @Override
             public void fireCreatorModified(DesignerEvent evt) {
+                if (formDesign.getArea() == null || !formDesign.getArea().isValid()) {
+                    return;
+                }
                 if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) {
                     setPropertyPaneChange(formDesign.getRootComponent());
                 } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {