diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
index fd8d8b4bbd0d48a1766d9c69127cd805b9831526..8b1b0241d3368f6060633a31f856bd6913691a18 100644
--- a/src/vs/editor/browser/view/viewImpl.ts
+++ b/src/vs/editor/browser/view/viewImpl.ts
@@ -482,7 +482,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 		StyleMutator.setHeight(this.linesContent, 1000000);
 
 		StyleMutator.setLeft(this.linesContentContainer, layoutInfo.contentLeft);
-		StyleMutator.setWidth(this.linesContentContainer, layoutInfo.contentWidth);
+		StyleMutator.setWidth(this.linesContentContainer, layoutInfo.contentWidth + layoutInfo.minimapWidth);
 		StyleMutator.setHeight(this.linesContentContainer, layoutInfo.contentHeight);
 
 		this.outgoingEvents.emitViewLayoutChanged(layoutInfo);
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index a597b75dd403cedefbafacce5fcba7c92488518a..4eb51147d1973493d1a5738c67ddf59dcb8b1917 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -390,7 +390,7 @@ export class Minimap extends ViewPart {
 
 		this._domNode = createFastDomNode(document.createElement('div'));
 		this._domNode.setPosition('absolute');
-		this._domNode.setRight(0);
+		this._domNode.setRight(this._context.configuration.editor.layoutInfo.verticalScrollbarWidth);
 
 		this._canvas = createFastDomNode(document.createElement('canvas'));
 		this._canvas.setPosition('absolute');