diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx
index 26ec17be5..603456d10 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -45,12 +45,24 @@ const CodeEditor = createClass({
 
 	makeBold : function() {
 		const selection = this.codeMirror.getSelection();
-		this.codeMirror.replaceSelection(`**${selection}**`, 'around');
+		if (selection.length === 0){
+			this.codeMirror.replaceSelection(`**${selection}**`, 'around');
+			let cursor = this.codeMirror.getCursor();
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
+		} else {
+			this.codeMirror.replaceSelection(`**${selection}**`, 'around');
+		}
 	},
-
+	
 	makeItalic : function() {
 		const selection = this.codeMirror.getSelection();
-		this.codeMirror.replaceSelection(`*${selection}*`, 'around');
+		if (selection.length === 0){
+			this.codeMirror.replaceSelection(`*${selection}*`, 'around');
+			let cursor = this.codeMirror.getCursor();
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
+		} else {
+			this.codeMirror.replaceSelection(`*${selection}*`, 'around');
+		}
 	},
 
 	componentWillReceiveProps : function(nextProps){