diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 28cb5360da603..d72a97a50aaed 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -355,6 +355,10 @@ class ViewLine implements IViewLineData {
 
 			if (clientRects.length > 0) {
 				result = this._createRawVisibleRangesFromClientRects(clientRects, deltaTop, correctionTop, deltaLeft);
+
+				if (startElement === endElement && startOffset === endOffset && endOffset === endElement.textContent.length) {
+					result[0].left = Math.max(0, endElement.parentElement.getBoundingClientRect().right - deltaLeft);
+				}
 			}
 
 			return result;
diff --git a/src/vs/workbench/browser/parts/editor/media/texteditor.css b/src/vs/workbench/browser/parts/editor/media/texteditor.css
index dce7e2e3581ee..bc7ca303c1644 100644
--- a/src/vs/workbench/browser/parts/editor/media/texteditor.css
+++ b/src/vs/workbench/browser/parts/editor/media/texteditor.css
@@ -6,4 +6,8 @@
 /* No highlight for current line when editor is inactive */
 .monaco-workbench > .editor > .content .inactive .monaco-editor .current-line {
 	border-width: 0;
-}
\ No newline at end of file
+}
+
+.monaco-editor {
+	text-rendering: optimizeLegibility;
+}