diff --git a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
index b8bb8cea63a..ae00a05e8dc 100644
--- a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
+++ b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
@@ -3,5 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './electron-browser/toggleWordWrap';
+import './electron-browser/toggleRenderControlCharacter';
 import './electron-browser/toggleRenderWhitespace';
+import './electron-browser/toggleWordWrap';
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts
new file mode 100644
index 00000000000..6e8205b0cdd
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as nls from 'vs/nls';
+import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
+import { editorAction, ServicesAccessor, EditorAction } from 'vs/editor/common/editorCommonExtensions';
+import { IConfigurationEditingService, ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
+import { IMessageService, Severity } from 'vs/platform/message/common/message';
+
+@editorAction
+export class ToggleRenderControlCharacterAction extends EditorAction {
+
+	constructor() {
+		super({
+			id: 'editor.action.toggleRenderControlCharacter',
+			label: nls.localize('toggleRenderControlCharacters', "Toggle Control Characters"),
+			alias: 'Toggle Render Control Characters',
+			precondition: null
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
+		const configurationEditingService = accessor.get(IConfigurationEditingService);
+		const messageService = accessor.get(IMessageService);
+
+		let newRenderControlCharacters = !editor.getConfiguration().viewInfo.renderControlCharacters;
+
+		configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: 'editor.renderControlCharacters', value: newRenderControlCharacters }).then(null, error => {
+			messageService.show(Severity.Error, error);
+		});
+	}
+}
diff --git a/src/vs/workbench/parts/indentation/common/indentation.ts b/src/vs/workbench/parts/indentation/common/indentation.ts
index b1f70f9fb87..2f95969bcf4 100644
--- a/src/vs/workbench/parts/indentation/common/indentation.ts
+++ b/src/vs/workbench/parts/indentation/common/indentation.ts
@@ -160,24 +160,3 @@ export class DetectIndentation extends EditorAction {
 		model.detectIndentation(creationOpts.insertSpaces, creationOpts.tabSize);
 	}
 }
-
-
-
-@editorAction
-export class ToggleRenderControlCharacterAction extends EditorAction {
-
-	constructor() {
-		super({
-			id: 'editor.action.toggleRenderControlCharacter',
-			label: nls.localize('toggleRenderControlCharacters', "Toggle Control Characters"),
-			alias: 'Toggle Render Control Characters',
-			precondition: null
-		});
-	}
-
-	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
-		editor.updateOptions({
-			renderControlCharacters: !editor.getConfiguration().viewInfo.renderControlCharacters
-		});
-	}
-}