diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 9235c406a..5bd96dc4f 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -449,15 +449,13 @@ class Editor extends View
     @compositeCursor.updateBufferPosition() unless e.bufferChanged
 
     if @attached
-      firstVisibleScreenRow = @getFirstVisibleScreenRow()
-      lastVisibleScreenRow = @getLastVisibleScreenRow()
-
-      maxEndRow = Math.max(lastVisibleScreenRow, @lastRenderedScreenRow)
-      @gutter.renderLineNumbers(@firstRenderedScreenRow, maxEndRow) if e.lineNumbersChanged
       @verticalScrollbarContent.height(@lineHeight * @screenLineCount())
 
       return if oldScreenRange.start.row > @lastRenderedScreenRow
 
+      maxEndRow = Math.max(@getLastVisibleScreenRow(), @lastRenderedScreenRow)
+      @gutter.renderLineNumbers(@firstRenderedScreenRow, maxEndRow) if e.lineNumbersChanged
+
       newScreenRange = newScreenRange.copy()
       oldScreenRange = oldScreenRange.copy()
       endOfShortestRange = Math.min(oldScreenRange.end.row, newScreenRange.end.row)