diff --git a/lib/codemirror.js b/lib/codemirror.js
index c8612d0b5a7b98fa6fe1f872761b6721b4fb6095..1b4395adf8d4b73594b5a42a725b89bc5b969ff5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5885,7 +5885,9 @@
     if (!contains(document.body, widget.node)) {
       var parentStyle = "position: relative;";
       if (widget.coverGutter)
-        parentStyle += "margin-left: -" + widget.cm.getGutterElement().offsetWidth + "px;";
+        parentStyle += "margin-left: -" + widget.cm.display.gutters.offsetWidth + "px;";
+      if (widget.noHScroll)
+        parentStyle += "width: " + widget.cm.display.wrapper.clientWidth + "px;";
       removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, parentStyle));
     }
     return widget.height = widget.node.offsetHeight;