diff --git a/src/vs/editor/browser/editor.all.ts b/src/vs/editor/browser/editor.all.ts
index 7c67fa7af397eedd10f3fca6974ef7623689d4c6..2cd0530de4503aeb5d6cad4a2685138bd2711d7c 100644
--- a/src/vs/editor/browser/editor.all.ts
+++ b/src/vs/editor/browser/editor.all.ts
@@ -38,7 +38,6 @@ import 'vs/editor/contrib/suggest/common/snippetCompletion';
 import 'vs/editor/contrib/suggest/browser/suggestController';
 import 'vs/editor/contrib/suggest/browser/tabCompletion';
 import 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode';
-import 'vs/editor/contrib/toggleWordWrap/common/toggleWordWrap';
 import 'vs/css!vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
 import 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';
 import 'vs/editor/contrib/folding/browser/folding';
diff --git a/src/vs/workbench/electron-browser/workbench.main.ts b/src/vs/workbench/electron-browser/workbench.main.ts
index 373004d7afe86edabeccd56a86cb9599352d5a99..f0752a06f23d3046d2b9fc29998571af5c458312 100644
--- a/src/vs/workbench/electron-browser/workbench.main.ts
+++ b/src/vs/workbench/electron-browser/workbench.main.ts
@@ -80,7 +80,9 @@ import 'vs/workbench/parts/tasks/electron-browser/task.contribution';
 import 'vs/workbench/parts/emmet/browser/emmet.browser.contribution';
 import 'vs/workbench/parts/emmet/node/emmet.contribution';
 
+// Code Editor enhacements
 import 'vs/workbench/parts/indentation/common/indentation';
+import 'vs/workbench/parts/codeEditor/codeEditor.contribution';
 
 import 'vs/workbench/parts/execution/electron-browser/execution.contribution';
 import 'vs/workbench/parts/execution/electron-browser/terminal.contribution';
diff --git a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
new file mode 100644
index 0000000000000000000000000000000000000000..12e1fc1d7f7e3ecf55a17aa358cc13af89acfda2
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './electron-browser/toggleWordWrap';
diff --git a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
similarity index 100%
rename from src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts
rename to src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts