diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
index 6a07c6408f0d..456c2c8231cf 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
@@ -332,6 +332,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
         @Override
         public void projectClosing(Project project) {
           releaseEditor(myEditor);
+          myEditor = null;
         }
       };
       ProjectManager.getInstance().addProjectManagerListener(myProject, listener);