diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java
index bc1d90c8e724..6d9cd2083c40 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java
@@ -61,6 +61,9 @@ public class DuplicateAction extends EditorAction {
       VisualPosition caret = editor.getCaretModel().getVisualPosition();
       LogicalPosition lineStart = editor.visualToLogicalPosition(new VisualPosition(caret.line, 0));
       LogicalPosition nextLineStart = editor.visualToLogicalPosition(new VisualPosition(caret.line + 1, 0));
+      if (nextLineStart.line == lineStart.line) {
+        nextLineStart = new LogicalPosition(lineStart.line+1, 0);
+      }
 
       int start = editor.logicalPositionToOffset(lineStart);
       int end = editor.logicalPositionToOffset(nextLineStart);
@@ -86,4 +89,4 @@ public class DuplicateAction extends EditorAction {
       presentation.setText(EditorBundle.message("action.duplicate.line"), true);
     }
   }
-}
\ No newline at end of file
+}