diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
index c3b37c768c4d..25f2e8669a9e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
@@ -163,7 +163,7 @@ public class AutoHardWrapHandler {
     DocumentListener listener = new DocumentListener() {
       @Override
       public void beforeDocumentChange(DocumentEvent event) {
-        if (event.getOffset() <= baseCaretOffset) {
+        if (event.getOffset() <= baseCaretOffset + caretOffsetDiff[0]) {
           caretOffsetDiff[0] += event.getNewLength() - event.getOldLength();
         }