diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
index c660caad22fb..f54e41dbae83 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
@@ -80,6 +80,8 @@ public class HierarchyTreeBuilder extends AbstractTreeBuilder {
   }
 
   protected boolean isAutoExpandNode(final NodeDescriptor nodeDescriptor) {
+    if (getTreeStructure().getRootElement().equals(nodeDescriptor.getElement())) return true;
+
     if (nodeDescriptor instanceof HierarchyNodeDescriptor) {
       return false;
     }