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 e1b700eee8c8..caebc8ae5ce4 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
@@ -245,6 +245,7 @@ public class TreeState implements JDOMExternalizable {
   }
 
   public void applyTo(@NotNull JTree tree, @Nullable Object root) {
+    LOG.debug(new IllegalStateException("restore paths"));
     if (visit(tree)) return; // AsyncTreeModel#accept
     if (root == null) return;
     TreeFacade facade = TreeFacade.getFacade(tree);
@@ -470,26 +471,21 @@ public class TreeState implements JDOMExternalizable {
     return false;
   }
 
-  private Promise<List<TreePath>> expand(@NotNull TreeVisitor.Acceptor acceptor, @NotNull JTree tree) {
-    return collectResults(myExpandedPaths.stream()
-                            .map(elements -> new Visitor(elements, tree::expandPath))
-                            .map(acceptor::accept).collect(toList()));
+  private Promise<List<TreePath>> expand(@NotNull JTree tree) {
+    return collectResults(myExpandedPaths.stream().map(elements -> TreeUtil.promiseExpand(tree, new Visitor(elements))).collect(toList()));
   }
 
-  private Promise<List<TreePath>> select(@NotNull TreeVisitor.Acceptor acceptor) {
-    return collectResults(mySelectedPaths.stream()
-                            .map(elements -> new Visitor(elements, null))
-                            .map(acceptor::accept).collect(toList()));
+  private Promise<List<TreePath>> select(@NotNull JTree tree) {
+    return collectResults(mySelectedPaths.stream().map(elements -> TreeUtil.promiseAccept(tree, new Visitor(elements))).collect(toList()));
   }
 
   private boolean visit(@NotNull JTree tree) {
     TreeModel model = tree.getModel();
     if (!(model instanceof TreeVisitor.Acceptor)) return false;
-    TreeVisitor.Acceptor acceptor = (TreeVisitor.Acceptor)model;
 
-    expand(tree, promise -> expand(acceptor, tree).processed(expanded -> {
+    expand(tree, promise -> expand(tree).processed(expanded -> {
       if (isSelectionNeeded(expanded, tree, promise)) {
-        select(acceptor).processed(selected -> {
+        select(tree).processed(selected -> {
           if (isSelectionNeeded(selected, tree, promise)) {
             for (TreePath path : selected) {
               tree.addSelectionPath(path);
@@ -504,11 +500,9 @@ public class TreeState implements JDOMExternalizable {
 
   private static final class Visitor implements TreeVisitor {
     private final List<PathElement> elements;
-    private final Consumer<TreePath> consumer;
 
-    Visitor(List<PathElement> elements, Consumer<TreePath> consumer) {
+    Visitor(List<PathElement> elements) {
       this.elements = elements;
-      this.consumer = consumer;
     }
 
     @NotNull
@@ -517,9 +511,7 @@ public class TreeState implements JDOMExternalizable {
       int count = path.getPathCount();
       if (count > elements.size()) return Action.SKIP_CHILDREN;
       boolean matches = elements.get(count - 1).isMatchTo(path.getLastPathComponent());
-      if (!matches) return Action.SKIP_CHILDREN;
-      if (consumer != null) consumer.accept(path);
-      return count < elements.size() ? Action.CONTINUE : Action.INTERRUPT;
+      return !matches ? Action.SKIP_CHILDREN : count < elements.size() ? Action.CONTINUE : Action.INTERRUPT;
     }
   }
 }
diff --git a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
index e13692a0b8e7..7bd7d384d819 100644
--- a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
+++ b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
@@ -1085,6 +1085,37 @@ public final class TreeUtil {
     return Comparator.comparingInt(tree::getRowForPath);
   }
 
+  /**
+   * Expands nodes in the specified tree.
+   *
+   * @param tree     a tree, which nodes should be expanded
+   * @param visitor  a visitor that controls expanding of tree nodes
+   * @param consumer a path consumer called on done
+   */
+  public static void expand(@NotNull JTree tree, @NotNull TreeVisitor visitor, @NotNull Consumer<TreePath> consumer) {
+    promiseExpand(tree, visitor).processed(path -> consumer.accept(path));
+  }
+
+  /**
+   * Promises to expand nodes in the specified tree.
+   *
+   * @param tree    a tree, which nodes should be expanded
+   * @param visitor a visitor that controls expanding of tree nodes
+   */
+  @NotNull
+  public static Promise<TreePath> promiseExpand(@NotNull JTree tree, @NotNull TreeVisitor visitor) {
+    return promiseAccept(tree, path -> {
+      TreeVisitor.Action action = visitor.visit(path);
+      if (action == TreeVisitor.Action.CONTINUE || action == TreeVisitor.Action.INTERRUPT) {
+        TreePath parent = path.getParentPath();
+        if (parent != null && !tree.isExpanded(parent)) return TreeVisitor.Action.SKIP_SIBLINGS;
+        tree.expandPath(path); // expand current path only if parent path is expanded
+        LOG.debug("tree expand path: ", path);
+      }
+      return action;
+    });
+  }
+
   /**
    * Processes nodes in the specified tree.
    *