diff --git a/core/admin/assets/js/views/editor.js b/core/admin/assets/js/views/editor.js
index d75399626e..b1bc3820a5 100644
--- a/core/admin/assets/js/views/editor.js
+++ b/core/admin/assets/js/views/editor.js
@@ -232,6 +232,7 @@
             this.editor = CodeMirror.fromTextArea(document.getElementById('entry-markdown'), {
                 mode: 'markdown',
                 tabMode: 'indent',
+                tabindex: "2",
                 lineWrapping: true
             });
 
diff --git a/core/admin/views/editor.hbs b/core/admin/views/editor.hbs
index 84e369b657..0877fdb520 100644
--- a/core/admin/views/editor.hbs
+++ b/core/admin/views/editor.hbs
@@ -4,7 +4,7 @@
     <section class="box entry-title">
         <input type="text" id="entry-title"
                placeholder="{{e "editor.entry_title.placeholder" "The Post Title Gets Inserted Up Here"}}"
-               value="{{title}}">
+               value="{{title}}" tabindex="1">
     </section>
 </header>