diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx
index 2b8879f7c..7f0c315fe 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -103,9 +103,12 @@ const CodeEditor = createClass({
 
 	makeLink : function() {
 		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 1) === '[' && selection.slice(-3) === ']()';
-		this.codeMirror.replaceSelection(t ? selection.slice(1, -3) : `[${selection}]()`, 'around');
-		const cursor = this.codeMirror.getCursor();
-		this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
+		this.codeMirror.replaceSelection(t ? selection.slice(1, -3) : `[${selection}]()`);
+		if ((selection.slice(0, 1) !== '[' || selection.slice(-3) !== ']()') || selection.length === 0){
+			const cursor = this.codeMirror.getCursor();
+			console.log('hello');
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
+		}
 	},
 
 	//=-- Externally used -==//