diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java
index 6dedbf26be9f..ce80f8907a89 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java
@@ -294,7 +294,12 @@ public class TreeState implements JDOMExternalizable {
   public void applyTo(final JTree tree, final DefaultMutableTreeNode node) {
     applyExpanded(getFacade(tree), node);
     if (tree.getSelectionCount() == 0) {
-      applySelected(tree, node);
+      getFacade(tree).getInitialized().doWhenDone(new Runnable() {
+        @Override
+        public void run() {
+          applySelected(tree, node);
+        }
+      });
     }
   }