diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 7df30623359..19ce13aa99b 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -6,6 +6,8 @@
     overflow: hidden;
     font-family: 'Monaco', 'Menlo', 'Droid Sans Mono', 'Courier New', monospace;
     font-size: 12px;
+    width: 100%;
+    height: 100%;
 }
 
 .ace_scroller {
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 35332bd8d89..ac3251e6c7c 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -819,8 +819,15 @@ var VirtualRenderer = function(container, theme) {
 
             // force re-measure of the gutter width
             if (_self.$size) {
-                _self.$size.width = 0;
-                _self.onResize();
+                var checkGutterInitialized = function () {
+					// if offset width larger than 0 than force resize
+					if (_self.$gutter.offsetWidth > 0) {
+						_self.onResize(true);
+					} else {
+						setTimeout(checkGutterInitialized, 50); // try again in 50 ms.
+					}
+				};
+                checkGutterInitialized();
             }
         }
     };