diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
index 0a2d1a911aa6..af0a29796c3b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
@@ -125,7 +125,6 @@ public class EnterHandler extends BaseEnterHandler {
 
       if (result == EnterHandlerDelegate.Result.Stop) return;
       if (result != EnterHandlerDelegate.Result.Continue) {
-        text = document.getCharsSequence();
         if (result == EnterHandlerDelegate.Result.DefaultForceIndent) {
           forceIndent = true;
         }
@@ -133,6 +132,7 @@ public class EnterHandler extends BaseEnterHandler {
       }
     }
 
+    text = document.getCharsSequence();   // update after changes done in preprocessEnter()
     caretOffset = caretOffsetRef.get().intValue();
     boolean isFirstColumn = caretOffset == 0 || text.charAt(caretOffset - 1) == '\n';
     final boolean insertSpace =