diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java
index dfb0754d97fe..0cca6f12aa12 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java
@@ -16,8 +16,8 @@
 
 package com.intellij.codeInsight.folding.impl;
 
-import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.folding.FoldingDescriptor;
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.FoldRegion;
 import com.intellij.openapi.editor.ex.DocumentEx;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
index a7469b0750a8..18bb76499f02 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
@@ -139,7 +139,7 @@ public class FoldingUpdate {
           if (!injectedEditor.getDocument().isValid()) continue;
           Map<PsiElement, FoldingDescriptor> map = maps.get(i);
           UpdateFoldRegionsOperation op = new UpdateFoldRegionsOperation(project, injectedEditor, map, applyDefaultState, true);
-          editor.getFoldingModel().runBatchFoldingOperationDoNotCollapseCaret(op);
+          injectedEditor.getFoldingModel().runBatchFoldingOperationDoNotCollapseCaret(op);
         }
 
         editor.putUserData(LAST_UPDATE_INJECTED_STAMP_KEY, timeStamp);