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 5aaad3688882..c915753999c9 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
@@ -26,6 +26,7 @@ import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -46,7 +47,11 @@ public class PsiAwareTextEditorImpl extends TextEditorImpl {
 
   @Override
   public void initFolding() {
-    CodeFoldingManager.getInstance(myProject).buildInitialFoldings(getEditor());
+    ApplicationManager.getApplication().runReadAction(new Runnable() {
+      public void run() {
+        CodeFoldingManager.getInstance(myProject).buildInitialFoldings(getEditor());
+      }
+    });
   }
 
   @Override