diff --git a/src/vs/editor/contrib/links/browser/links.ts b/src/vs/editor/contrib/links/browser/links.ts
index 04ebb1a926b6948f026b050ee09ffe19436ceaf0..7b566b860beab85ba674c481f1ecd2ba6a216a0a 100644
--- a/src/vs/editor/contrib/links/browser/links.ts
+++ b/src/vs/editor/contrib/links/browser/links.ts
@@ -108,6 +108,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	static RECOMPUTE_TIME = 1000; // ms
 
 	private editor: ICodeEditor;
+	private enabled: boolean;
 	private listenersToRemove: IDisposable[];
 	private timeoutPromise: TPromise<void>;
 	private computePromise: TPromise<void>;
@@ -141,6 +142,24 @@ class LinkDetector implements editorCommon.IEditorContribution {
 			this.cleanUpActiveLinkDecoration();
 		}));
 
+		this.enabled = editor.getConfiguration().contribInfo.links;
+		this.listenersToRemove.push(editor.onDidChangeConfiguration((e) => {
+			let enabled = editor.getConfiguration().contribInfo.links;
+			if (this.enabled === enabled) {
+				// No change in our configuration option
+				return;
+			}
+			this.enabled = enabled;
+
+			// Remove any links (for the getting disabled case)
+			this.updateDecorations([]);
+
+			// Stop any computation (for the getting disabled case)
+			this.stop();
+
+			// Start computing (for the getting enabled case)
+			this.beginCompute();
+		}));
 		this.listenersToRemove.push(editor.onDidChangeModelContent((e) => this.onChange()));
 		this.listenersToRemove.push(editor.onDidChangeModel((e) => this.onModelChanged()));
 		this.listenersToRemove.push(editor.onDidChangeModelLanguage((e) => this.onModelModeChanged()));
@@ -184,7 +203,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	}
 
 	private beginCompute(): void {
-		if (!this.editor.getModel() || !this.editor.getConfiguration().contribInfo.links) {
+		if (!this.editor.getModel() || !this.enabled) {
 			return;
 		}