diff --git a/src/vs/workbench/services/hover/browser/hoverWidget.ts b/src/vs/workbench/services/hover/browser/hoverWidget.ts
index d7135f2d671a52632b2bcd5b68890f57477c33d9..84e12a399ba2bf08fe0ddd6a2c245dfb1f321fe9 100644
--- a/src/vs/workbench/services/hover/browser/hoverWidget.ts
+++ b/src/vs/workbench/services/hover/browser/hoverWidget.ts
@@ -141,7 +141,7 @@ export class HoverWidget extends Widget {
 		// Get horizontal alignment and position
 		let targetLeft = this._target.x !== undefined ? this._target.x : Math.min(...targetBounds.map(e => e.left));
 		if (targetLeft + this._hover.containerDomNode.clientWidth >= document.documentElement.clientWidth) {
-			this._x = document.documentElement.clientWidth;
+			this._x = document.documentElement.clientWidth - 1;
 			this._hover.containerDomNode.classList.add('right-aligned');
 		} else {
 			this._x = targetLeft;
diff --git a/src/vs/workbench/services/hover/browser/media/hover.css b/src/vs/workbench/services/hover/browser/media/hover.css
index 47d8ab484c639805f70d4aeeed8e6ecae276fadb..6514844fd10b6f3161a15a8ded378601be7fea4b 100644
--- a/src/vs/workbench/services/hover/browser/media/hover.css
+++ b/src/vs/workbench/services/hover/browser/media/hover.css
@@ -18,6 +18,11 @@
 	color: #3794ff;
 }
 
+.monaco-workbench .workbench-hover.right-aligned {
+	/* The context view service wraps strangely when it's right up against the edge without this */
+	left: 1px;
+}
+
 .monaco-workbench .workbench-hover.right-aligned .hover-row.status-bar .actions {
 	flex-direction: row-reverse;
 }