diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
index 33335b817f39..e7d42aee8381 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
@@ -139,12 +139,17 @@ public final class TreeEditableArea implements EditableArea, FeedbackTreeLayer,
 
     if (value == null) {
       myTreeBuilder.select(ArrayUtil.EMPTY_OBJECT_ARRAY, null);
+      myTree.clearSelection();
     }
     else if (value instanceof RadComponent) {
       myTreeBuilder.select(value);
     }
     else {
-      myTreeBuilder.select(((Collection)value).toArray(), null);
+      Collection collection = (Collection)value;
+      myTreeBuilder.select(collection.toArray(), null);
+      if (collection.isEmpty()) {
+        myTree.clearSelection();
+      }
     }
 
     hookSelection();