diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
index c857c20b329f..5d40880be8c5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
@@ -132,11 +132,9 @@ public class EditorWindow {
     final FileEditorManagerImpl editorManager = getManager();
     editorManager.runChange(new FileEditorManagerChange() {
       public void run(EditorsSplitters splitters) {
+        final List<EditorWithProviderComposite> editors = myOwner.findEditorComposites(file);
+        if (editors.isEmpty()) return;
         try {
-          if (myOwner != splitters) return;
-
-          final List<EditorWithProviderComposite> editors = myOwner.findEditorComposites(file);
-          if (editors.isEmpty()) return;
           final EditorWithProviderComposite editor = findFileComposite(file);
 
           final FileEditorManagerListener.Before beforePublisher =