diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
index 4f8a74950f87..1be13e6b0093 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
@@ -322,7 +322,8 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
   }
 
   void releaseEditor(@NotNull final Editor editor) {
-    if (myProject != null && myIsViewer) {
+    // todo IMHO this should be removed completely
+    if (myProject != null && !myProject.isDisposed() && myIsViewer) {
       final PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(editor.getDocument());
       if (psiFile != null) {
         DaemonCodeAnalyzer.getInstance(myProject).setHighlightingEnabled(psiFile, true);