diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index c22722eabf75..b5f106257977 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -635,7 +635,10 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo JTree tree = pane.getTree(); if (tree != null && projectView instanceof ProjectViewImpl impl && impl.firstShow) { impl.firstShow = false; - if (!pane.myNonEmptyTreeStateRestored) { + if (pane.myNonEmptyTreeStateRestored) { + TreeUtil.promiseSelectFirst(tree); + } + else { TreeUtil.promiseSelectFirst(tree).onSuccess(tree::expandPath); } }