diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index d1813bcf35b..22a48685ee0 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -26,8 +26,15 @@ export default Ember.Component.extend({
       this._editor.destroy();
       this._editor = null;
     }
+    this.appEvents.off('ace:resize', this, this.resize);
   }.on('willDestroyElement'),
 
+  resize() {
+    if (this._editor) {
+      this._editor.resize();
+    }
+  },
+
   _initEditor: function() {
     const self = this;
 
@@ -43,9 +50,11 @@ export default Ember.Component.extend({
           self.set('content', editor.getSession().getValue());
           self._skipContentChangeEvent = false;
         });
+        editor.$blockScrolling = Infinity;
 
         self.$().data('editor', editor);
         self._editor = editor;
+        self.appEvents.on('ace:resize', self, self.resize);
       });
     });