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 7c6475fc4610..26b9e89ec0e4 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
@@ -304,15 +304,20 @@ public class FileStructurePopup implements Disposable {
           token.finish();
         }
 
-        myAbstractTreeBuilder.queueUpdate().doWhenDone(new Runnable() {
+        SwingUtilities.invokeLater(new Runnable() {
           @Override
           public void run() {
-            myTreeHasBuilt.setDone();
-            //noinspection SSBasedInspection
-            SwingUtilities.invokeLater(new Runnable() {
+            myAbstractTreeBuilder.queueUpdate().doWhenDone(new Runnable() {
               @Override
               public void run() {
-                selectPsiElement(myInitialPsiElement);
+                myTreeHasBuilt.setDone();
+                //noinspection SSBasedInspection
+                SwingUtilities.invokeLater(new Runnable() {
+                  @Override
+                  public void run() {
+                    selectPsiElement(myInitialPsiElement);
+                  }
+                });
               }
             });
           }