diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
index 8869acaef8ef..13f6ccf4d019 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
@@ -805,10 +805,6 @@ class AbstractTreeUi {
           if (expanded) {
             expand(node, canSmartExpand);
           }
-
-          if (expanded || wasLeaf) {
-            expand(node, descriptor, wasLeaf, canSmartExpand);
-          }
         }
 
         removeFromUpdating(node);
@@ -2610,7 +2606,9 @@ class AbstractTreeUi {
       public void onReady(final DefaultMutableTreeNode node) {
 
         if (node.getChildCount() > 0 && !myTree.isExpanded(new TreePath(node.getPath()))) {
-          expand(node, canSmartExpand);
+          if (!isAutoExpand(node)) {
+            expand(node, canSmartExpand);
+          }
         }
 
         if (expandIndex <= 0) {