diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js
index e336ff0629..ec947638b8 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js
@@ -59,9 +59,7 @@ export default Component.extend({
 
     actions: {
         enterEditMode() {
-            // this action is called before the component is rendered so we
-            // need to wait to ensure that the textarea element is present
-            run.scheduleOnce('afterRender', this, this._focusTextarea);
+
         },
 
         leaveEditMode() {
@@ -121,10 +119,6 @@ export default Component.extend({
         }
     },
 
-    _focusTextarea() {
-        this.element.querySelector('textarea').focus();
-    },
-
     _applyToolbarStyles() {
         let toolbar = this.element.querySelector('.editor-toolbar');
 
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-markdown.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-markdown.hbs
index 10b04d7531..8a66ff3521 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-markdown.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-markdown.hbs
@@ -21,6 +21,7 @@
             {{#gh-markdown-editor
                 markdown=(readonly payload.markdown)
                 onChange=(action "updateMarkdown")
+                autofocus=true
                 enableSideBySide=false
                 enablePreview=false
                 enableHemingway=false