diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
index a18eac987dcf..ae1f886ec880 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
@@ -131,6 +131,12 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl
   private void rebuildCompletely() {
     updateFromRoot(true).waitFor(5000);
     myReadTreeState.clear(); // cleanup cached tree paths
+    JTree tree = getTree();
+    if (tree != null) {
+      tree.clearSelection();
+      tree.setAnchorSelectionPath(null);
+      tree.setLeadSelectionPath(null);
+    }
   }
 
   /**