diff --git a/src/editor-component.coffee b/src/editor-component.coffee
index 3c1bae114..86b3abaad 100644
--- a/src/editor-component.coffee
+++ b/src/editor-component.coffee
@@ -512,7 +512,9 @@ EditorComponent = React.createClass
     @pendingScrollTop = scrollTop
     unless animationFramePending
       requestAnimationFrame =>
-        @props.editor.setScrollTop(@pendingScrollTop)
+        pendingScrollTop = @pendingScrollTop
+        @pendingScrollTop = null
+        @props.editor.setScrollTop(pendingScrollTop)
 
   onHorizontalScroll: (scrollLeft) ->
     {editor} = @props