diff --git a/src/lines-component.coffee b/src/lines-component.coffee
index 7a0f74a97..c2bd8e22a 100644
--- a/src/lines-component.coffee
+++ b/src/lines-component.coffee
@@ -20,12 +20,12 @@ LinesComponent = React.createClass
     {performedInitialMeasurement, cursorBlinkPeriod, cursorBlinkResumeDelay} = @props
 
     if performedInitialMeasurement
-      {editor, presenter, overlayDecorations, highlightDecorations, scrollHeight, placeholderText, backgroundColor} = @props
+      {editor, presenter, overlayDecorations, highlightDecorations, placeholderText, backgroundColor} = @props
 
       @newState = presenter.state.content
       @oldState ?= {lines: {}}
 
-      {scrollWidth} = @newState
+      {scrollWidth, scrollHeight} = @newState
       {lineHeightInPixels, defaultCharWidth, scrollViewHeight, scopedCharacterWidthsChangeCount} = @props
       {scrollTop, scrollLeft, cursorPixelRects} = @props
       style =