diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
index a215bca645..cd1b1d8181 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
@@ -281,6 +281,10 @@
                         opts.callbacks.unshift(options.onLoad);
                     }
 
+                    if (opts.autoFocus === true) {
+                        acee.focus();
+                    }
+
                     // EVENTS
 
                     // unbind old change listener
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
index f455e99fe7..b0d0ab5b20 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
@@ -12,6 +12,7 @@
             mode: "razor",
             theme: "chrome",
             showPrintMargin: false,
+            autoFocus: true,
             advanced: {
                 fontSize: "14px",
                 enableSnippets: false, //The Razor mode snippets are awful (Need a way to override these)