diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java
index 74c83d50d8cb..82b9f3430434 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java
@@ -185,7 +185,7 @@ public class CodeFoldingManagerImpl extends CodeFoldingManager implements Projec
     PsiDocumentManager.getInstance(myProject).commitDocument(document);
 
     Editor[] otherEditors = EditorFactory.getInstance().getEditors(document, myProject);
-    if (otherEditors.length == 0) {
+    if (otherEditors.length == 0 && !editor.isDisposed()) {
       getDocumentFoldingInfo(document).loadFromEditor(editor);
     }
     EditorFoldingInfo.get(editor).dispose();