diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 8de99943..f884f35c 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -105,6 +105,9 @@
     white-space: nowrap;
     height: 100%;
     width: 100%;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
 }
 
 .ace_text-layer {
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 98670b02..b7612d17 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -50,7 +50,6 @@ var EventEmitter = require("../lib/event_emitter").EventEmitter;
 var Text = function(parentEl) {
     this.element = dom.createElement("div");
     this.element.className = "ace_layer ace_text-layer";
-    this.element.style.width = "auto";
     parentEl.appendChild(this.element);
 
     this.$characterSize = this.$measureSizes() || {width: 0, height: 0};