diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js b/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js
index 9c9d508bbb..8f0faf2a28 100644
--- a/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js
+++ b/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js
@@ -36,7 +36,9 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls.CodeEditor");
                 }
                 else {
                     //this is a wrapper for CodeMirror
+                    this._editor.focus();
                     this._editor.setValue(code);
+                    this._editor.focus();
                 }
             },
             GetSelection: function(code) {
@@ -150,4 +152,3 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls.CodeEditor");
         return obj;
     };
 })(jQuery); 
-