diff --git a/src/editor-scroll-view-component.coffee b/src/editor-scroll-view-component.coffee
index f87bc1ad7..c3a82b8ea 100644
--- a/src/editor-scroll-view-component.coffee
+++ b/src/editor-scroll-view-component.coffee
@@ -45,6 +45,11 @@ EditorScrollViewComponent = React.createClass
     @getDOMNode().addEventListener 'overflowchanged', @onOverflowChanged
     window.addEventListener('resize', @onWindowResize)
 
+    node.addEventListener 'scroll', ->
+      console.warn "EditorScrollView scroll position changed, and it shouldn't have. If you can reproduce this, please report it."
+      node.scrollTop = 0
+      node.scrollLeft = 0
+
     @measureHeightAndWidth()
 
   componentDidUnmount: ->