diff --git a/src/editor-component.coffee b/src/editor-component.coffee
index dc07b9613..37cffac49 100644
--- a/src/editor-component.coffee
+++ b/src/editor-component.coffee
@@ -102,7 +102,7 @@ EditorComponent = React.createClass
     {editor, lineOverdrawMargin} = @props
     [visibleStartRow, visibleEndRow] = editor.getVisibleRowRange()
     renderedStartRow = Math.max(0, visibleStartRow - lineOverdrawMargin)
-    renderedEndRow = Math.min(editor.getLineCount(), visibleEndRow + lineOverdrawMargin)
+    renderedEndRow = Math.min(editor.getScreenLineCount(), visibleEndRow + lineOverdrawMargin)
     [renderedStartRow, renderedEndRow]
 
   getInitialState: -> {}