diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorImpl.java
index 557e630d0a76..3dbd3f4a9a64 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorImpl.java
@@ -58,7 +58,7 @@ public class PsiAwareTextEditorImpl extends TextEditorImpl {
       if (foldingState != null) {
         foldingState.setToEditor(getEditor());
       }
-      if (psiFile != null) {
+      if (psiFile != null && psiFile.isValid()) {
         DaemonCodeAnalyzer.getInstance(myProject).restart(psiFile);
       }
       EditorNotifications.getInstance(myProject).updateNotifications(myFile);