diff --git a/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig b/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
index 5bd7b56b..254db27b 100644
--- a/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
+++ b/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
@@ -23,6 +23,9 @@
         var editor = CodeMirror.fromTextArea(document.getElementById('frontmatter'), {
             mode: 'yaml',
             theme: 'paper',
+            {% if field.autofocus %}
+            autofocus: true,
+            {% endif %}
             indentUnit: 4,
             indentWithTabs: false,
             extraKeys: {Tab: function(cm) { cm.replaceSelection("    ", "end"); }}