diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
index 1257e43641d6..fe0506e9ff34 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
@@ -130,9 +130,9 @@ public class LiveTemplateSettingsEditor extends JPanel {
     return myTemplate;
   }
 
-  public void dispose() {
+  void dispose() {
     final Project project = myTemplateEditor.getProject();
-    if (project != null) {
+    if (project != null && !project.isDisposed()) {
       final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(myTemplateEditor.getDocument());
       if (psiFile != null) {
         DaemonCodeAnalyzer.getInstance(project).setHighlightingEnabled(psiFile, true);