diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 3ca0a482912c..880ccebfe0c9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -2942,7 +2942,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     }
 
     if (lineNumber >= totalLines) {
-      moveCaretToScreenPos(x, logicalLineToY(totalLines - 1));
+      moveCaretToScreenPos(x, visibleLineNumberToYPosition(getVisibleLineCount() - 1));
       return;
     }