diff --git a/src/sql/workbench/contrib/preferences/browser/sqlSettingsLayout.ts b/src/sql/workbench/contrib/preferences/browser/sqlSettingsLayout.ts
new file mode 100644
index 0000000000..b20b30ca4a
--- /dev/null
+++ b/src/sql/workbench/contrib/preferences/browser/sqlSettingsLayout.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { tocData as vstocData, ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
+
+// Copy existing table of contents and append
+export const tocData: ITOCEntry = Object.assign({}, vstocData);
+let sqlTocItems: ITOCEntry[] = [{
+	id: 'data',
+	label: localize('data', "Data"),
+	children: [
+		{
+			id: 'data/connection',
+			label: localize('connection', "Connection"),
+			settings: ['startup.alwaysShowServersView', 'connection.*', 'serverGroup.*', 'datasource.*']
+		},
+		{
+			id: 'data/query',
+			label: localize('query', "Query"),
+			settings: ['sql.query.*', 'resultsGrid.*']
+		},
+		{
+			id: 'data/notebook',
+			label: localize('notebook', "Notebook"),
+			settings: ['notebook.*']
+		},
+		{
+			id: 'data/sql',
+			label: localize('sql', "SQL"),
+			settings: ['sql.*']
+		},
+		{
+			id: 'data/mssql',
+			label: localize('mssql', "Microsoft SQL Server"),
+			settings: ['mssql.*']
+		},
+		{
+			id: 'data/dashboard',
+			label: localize('dashboard', "Dashboard"),
+			settings: ['dashboard.*']
+		},
+		{
+			id: 'data/profiler',
+			label: localize('profiler', "Profiler"),
+			settings: ['profiler.*']
+		}
+	]
+}];
+tocData.children.push(...sqlTocItems);
diff --git a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
index 7a17f07c03..78cd89698f 100644
--- a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
@@ -31,7 +31,10 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditor, IEditorMemento } from 'vs/workbench/common/editor';
 import { attachSuggestEnabledInputBoxStyler, SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
-import { commonlyUsedData, tocData } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
+// {{SQL CARBON EDIT}}
+import { commonlyUsedData } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
+import { tocData } from 'sql/workbench/contrib/preferences/browser/sqlSettingsLayout';
+// {{SQL CARBON EDIT}} END
 import { AbstractSettingRenderer, ISettingLinkClickEvent, ISettingOverrideClickEvent, resolveExtensionsSettings, resolveSettingsTree, SettingsTree, SettingTreeRenderers } from 'vs/workbench/contrib/preferences/browser/settingsTree';
 import { ISettingsEditorViewState, parseQuery, SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
 import { settingsTextInputBorder } from 'vs/workbench/contrib/preferences/browser/settingsWidgets';