diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
index 5b978d79bc26..26b9e89ec0e4 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
@@ -27,7 +27,6 @@ import com.intellij.ide.structureView.impl.common.PsiTreeElementBase;
 import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
 import com.intellij.ide.structureView.newStructureView.TreeModelWrapper;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
-import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.ide.util.treeView.NodeRenderer;
 import com.intellij.ide.util.treeView.smartTree.*;
 import com.intellij.navigation.ItemPresentation;
@@ -124,8 +123,6 @@ public class FileStructurePopup implements Disposable {
   private final boolean myDaemonUpdateEnabled;
   private final List<Pair<String, JCheckBox>> myTriggeredCheckboxes = new ArrayList<Pair<String, JCheckBox>>();
   private final TreeExpander myTreeExpander;
-  private Ref<Boolean> myAlwaysExpand = Ref.create(true);
-
 
 
   public FileStructurePopup(StructureViewModel structureViewModel,
@@ -208,11 +205,7 @@ public class FileStructurePopup implements Disposable {
     myAbstractTreeBuilder = new FilteringTreeBuilder(myTree, filter, myFilteringStructure, null) {
       @Override
       public void initRootNode() {
-      }
 
-      @Override
-      public boolean isAutoExpandNode(NodeDescriptor nodeDescriptor) {
-        return myAlwaysExpand.get();
       }
 
       @Override
@@ -323,7 +316,6 @@ public class FileStructurePopup implements Disposable {
                   @Override
                   public void run() {
                     selectPsiElement(myInitialPsiElement);
-                    myAlwaysExpand.set(false);
                   }
                 });
               }
@@ -868,7 +860,7 @@ public class FileStructurePopup implements Disposable {
           }
           return "";
         }
-      }, false);
+      }, true);
     }
 
     @Override