diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
index 045770b054a150523b820ec0aca60a5da8c6191d..70d862781ed488c51b6da2590ffd8561e3c689cf 100644
--- a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
@@ -8,9 +8,7 @@
 }
 
 .settings-editor {
-	padding: 11px 24px 0px;
-	max-width: 1000px;
-	margin: auto;
+	padding: 11px 0px 0px;
 }
 
 /* header styling */
@@ -19,6 +17,9 @@
 	margin: auto;
 	overflow: hidden;
 	padding-top: 3px;
+	padding-left: 24px;
+	padding-right: 24px;
+	max-width: 1000px;
 }
 
 .settings-editor > .settings-header > .search-container {
@@ -91,7 +92,8 @@
 }
 
 .settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget > .monaco-action-bar .action-item {
-	padding: 0px; /* padding must be on action-label because it has the bottom-border, because that's where the .checked class is */
+	padding: 0px;
+	/* padding must be on action-label because it has the bottom-border, because that's where the .checked class is */
 }
 
 .settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget > .monaco-action-bar .action-item .action-label {
@@ -104,12 +106,6 @@
 	padding-right: 8px;
 }
 
-.settings-editor > .settings-body {
-	display: flex;
-	margin: auto;
-	max-width: 1000px;
-}
-
 .settings-editor > .settings-body > .no-results {
 	margin-top: 20px;
 	display: none;
@@ -126,10 +122,27 @@
 	margin-left: 0px;
 }
 
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper {
+	max-width: 1000px;
+	margin: auto;
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper .monaco-tree-rows {
+	margin-left: 208px;
+	width: calc(100% - 208px);
+}
+
+.settings-editor.no-toc-search > .settings-body .settings-tree-container .monaco-tree-wrapper .monaco-tree-rows,
+.settings-editor.narrow > .settings-body .settings-tree-container .monaco-tree-wrapper .monaco-tree-rows {
+	/* 3 margin + 20 padding + 2 border */
+	width: calc(100% - 25px);
+	margin-left: 25px;
+}
+
 .settings-editor > .settings-body > .settings-tree-container .setting-measure-container {
-	/* 20 from monaco-tree-row */
-	padding-left: 20px;
-	width: calc(100% - 33px);
+	/* 208 margin + 20 padding + 2 border */
+	margin-left: 230px;
+	width: calc(100% - 230px);
 	border: 1px solid transparent;
 }
 
@@ -138,20 +151,14 @@
 	display: none !important;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .shadow.top:not(.top-left-corner) {
-	position: absolute;
-	left: -160px; /* toc width */
-	right: 0px;
-	width: initial;
-}
-
-.settings-editor > .settings-body > .settings-tree-container > .monaco-tree .shadow.top.top-left-corner {
-	position: absolute;
-	left: -160px;
+.settings-editor > .settings-body > .settings-tree-container .shadow.top {
+	max-width: 1000px;
+	margin: auto;
 }
 
 .settings-editor > .settings-body > .settings-tree-container > .monaco-tree .monaco-scrollable-element {
-	overflow: visible !important; /* so the shadow can be drawn outside the scrollable element */
+	overflow: visible !important;
+	/* so the shadow can be drawn outside the scrollable element */
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-toolbar-container {
@@ -192,8 +199,15 @@
 }
 
 .settings-editor > .settings-body .settings-toc-container {
+	width: 100%;
+	pointer-events: none;
+	z-index: 100;
+	position: absolute;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree {
 	width: 160px;
-	margin-top: 16px;
+	pointer-events: initial;
 }
 
 .settings-editor.no-toc-search > .settings-body .settings-toc-container,
@@ -246,22 +260,33 @@
 }
 
 .settings-editor > .settings-body .settings-tree-container {
-	flex: 1;
-	margin-right: 1px; /* So the item doesn't blend into the edge of the view container  */
-	margin-left: 20px;
+	margin-right: 1px;
+	/* So the item doesn't blend into the edge of the view container  */
 	margin-top: 14px;
 	border-spacing: 0;
 	border-collapse: separate;
 	position: relative;
 }
 
+.settings-editor > .settings-body .settings-toc-wrapper {
+	padding-left: 31px;
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper,
+.settings-editor > .settings-body .settings-toc-wrapper {
+	height: 100%;
+	max-width: 1000px;
+	margin: auto;
+}
+
 .settings-editor.no-toc-search > .settings-body .settings-tree-container,
 .settings-editor.narrow > .settings-body .settings-tree-container {
 	margin-left: 0px;
 }
 
 .settings-editor > .settings-body > .settings-tree-container .monaco-tree-row {
-	overflow: visible; /* so validation messages dont get clipped */
+	overflow: visible;
+	/* so validation messages dont get clipped */
 	cursor: default;
 }
 
@@ -374,7 +399,8 @@
 }
 
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown code {
-	line-height: 15px; /** For some reason, this is needed, otherwise <code> will take up 20px height */
+	line-height: 15px;
+	/** For some reason, this is needed, otherwise <code> will take up 20px height */
 	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
 }
 
@@ -500,4 +526,4 @@
 
 .settings-editor.search-mode > .settings-body .settings-toc-container .monaco-tree-row .settings-toc-count {
 	display: block;
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index a635727af4caa2e842281406a715729f7f26469f..4d7df4f12d4eaa22df2c463c14e09d0535ff4a7b 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -498,7 +498,8 @@ export class SettingsEditor2 extends BaseEditor {
 
 		const tocRenderer = this.instantiationService.createInstance(TOCRenderer);
 
-		this.tocTree = this._register(this.instantiationService.createInstance(TOCTree, this.tocTreeContainer,
+		this.tocTree = this._register(this.instantiationService.createInstance(TOCTree,
+			DOM.append(this.tocTreeContainer, $('.settings-toc-wrapper')),
 			this.viewState,
 			{
 				renderer: tocRenderer
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index 1a15f51a5e1b6f1a8c206cb5be72514dc712b063..cfa9240e3caf0cc0bab6bbdb854baf5dbb1cd913 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -366,7 +366,7 @@ export class SettingsRenderer implements ITreeRenderer {
 	private settingActions: IAction[];
 
 	constructor(
-		_measureContainer: HTMLElement,
+		_measureParent: HTMLElement,
 		@IThemeService private themeService: IThemeService,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IOpenerService private readonly openerService: IOpenerService,
@@ -376,7 +376,7 @@ export class SettingsRenderer implements ITreeRenderer {
 		@IKeybindingService private keybindingService: IKeybindingService,
 	) {
 		this.descriptionMeasureContainer = $('.setting-item-description');
-		DOM.append(_measureContainer,
+		DOM.append(_measureParent,
 			$('.setting-measure-container.monaco-tree-row', undefined,
 				$('.setting-item', undefined,
 					this.descriptionMeasureContainer)));