diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
index 7c472933f7d7..7fb39d6f53fc 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
@@ -161,7 +161,7 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc
    */
   int incrementalUpdate(int eventOffset, int eventOldLength, int eventNewLength, @NotNull Document document) {
     CharSequence text = document.getImmutableCharSequence();
-    if (mySegments.getSegmentCount() == 0) {
+    if (mySegments.getSegmentCount() == 0 || mySegments.getLastValidOffset() < eventOffset) {
       setText(text);
       return text.length();
     }