diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 312ed3ab..0dc0c179 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -305,6 +305,11 @@ var VirtualRenderer = function(container, theme) {
             size.height = height;
 
             size.scrollerHeight = this.scroller.clientHeight;
+            if (!size.scrollerHeight) {
+                size.scrollerHeight = size.height;
+                if (this.$horizScroll)
+                    size.scrollerHeight -= this.scrollBar.getWidth();
+            }
             this.scrollBar.setHeight(size.scrollerHeight);
 
             if (this.session) {
@@ -333,6 +338,9 @@ var VirtualRenderer = function(container, theme) {
         else
             this.$loop.schedule(changes);
         
+        if (force)
+            this.$gutterLayer.$padding = null;
+        
         if (force)
             delete this.resizing;
     };