diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
index 3c7e86116ca2..04eb4bd710fa 100644
--- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
@@ -222,11 +222,11 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
     Runnable runnable = new Runnable() {
       @Override
       public void run() {
+        if (!Comparing.equal(myFileEditor, fileEditor)) {
+          myFile = file;
+          rebuild();
+        }
         if (myStructureView != null) {
-          if (!Comparing.equal(myFileEditor, fileEditor)) {
-            myFile = file;
-            rebuild();
-          }
           myStructureView.navigateToSelectedElement(requestFocus);
         }
       }