diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
index f3c4f245dd..453dee4bb7 100644
--- a/addon/hint/show-hint.css
+++ b/addon/hint/show-hint.css
@@ -16,6 +16,7 @@
   background: white;
   font-size: 90%;
   font-family: monospace;
+  max-width: 19em;
 
   max-height: 20em;
   overflow-y: auto;
@@ -25,7 +26,6 @@
   margin: 0;
   padding: 0 4px;
   border-radius: 2px;
-  max-width: 19em;
   white-space: pre;
   color: black;
   cursor: pointer;
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index cc47af206c..64ec9289cc 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -254,7 +254,8 @@
       }
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
-    if (scrolls) hints.style.paddingRight = cm.display.nativeBarWidth + "px"
+    if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
+      node.style.paddingRight = cm.display.nativeBarWidth + "px"
 
     cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },