diff --git a/src/editor-component.coffee b/src/editor-component.coffee
index d243054db..5c8d3a70f 100644
--- a/src/editor-component.coffee
+++ b/src/editor-component.coffee
@@ -223,6 +223,9 @@ EditorCompont = React.createClass
     @refs.verticalScrollbar.getDOMNode().scrollTop -= event.wheelDeltaY
     event.preventDefault()
 
+  onOverflowChanged: ->
+    @props.editor.setHeight(@refs.scrollView.getDOMNode().clientHeight)
+
   onInput: (char, replaceLastChar) ->
     @props.editor.insertText(char)