diff --git a/build/js/live-editor.ui.js b/build/js/live-editor.ui.js
index 369e5d6f..7b70e0b4 100644
--- a/build/js/live-editor.ui.js
+++ b/build/js/live-editor.ui.js
@@ -2092,7 +2092,7 @@ window.LiveEditor = Backbone.View.extend({
 
     updateCanvasSize: function updateCanvasSize(width, height) {
         width = width || this.defaultOutputWidth;
-        height = height || this.defaultOutputHeight;
+        height = height || this.editorHeight || this.defaultOutputHeight;
 
         this.$el.find(this.dom.CANVAS_WRAP).width(width);
         this.$el.find(this.dom.ALL_OUTPUT).height(height);
diff --git a/js/live-editor.js b/js/live-editor.js
index b4792b91..3fd971dd 100644
--- a/js/live-editor.js
+++ b/js/live-editor.js
@@ -1402,7 +1402,7 @@ window.LiveEditor = Backbone.View.extend({
 
     updateCanvasSize: function(width, height) {
         width = width || this.defaultOutputWidth;
-        height = height || this.defaultOutputHeight;
+        height = height || this.editorHeight || this.defaultOutputHeight;
 
         this.$el.find(this.dom.CANVAS_WRAP).width(width);
         this.$el.find(this.dom.ALL_OUTPUT).height(height);