diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 9c4a9dfa..95f0234f 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -227,7 +227,9 @@
 		}
 
 		retval = fn[ command ].call( this, options );
-		codeMirror.focus();
+		if ( command === 'setSelection' ) {
+			codeMirror.focus();
+		}
 
 		return retval;
 	}