diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
index 13da24ce6094..68341260c389 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
@@ -622,7 +622,7 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
 
   @Override
   public boolean isUpToDate() {
-    return !myIsInUpdate;
+    return !myIsInUpdate && !myReportCaretMoves;
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
index 52450f1e254a..69296943bf0c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
@@ -395,7 +395,7 @@ public class FoldingModelImpl implements FoldingModelEx, PrioritizedDocumentList
 
     boolean oldCaretPositionSaved = myCaretPositionSaved;
 
-    if (moveCaretFromCollapsedRegion) {
+    if (moveCaretFromCollapsedRegion && myEditor.getCaretModel().isUpToDate()) {
       if (offsetToUse >= 0) {
         myEditor.getCaretModel().moveToOffset(offsetToUse);
       }