diff --git a/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig b/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
index 507d663b..5bd7b56b 100644
--- a/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
+++ b/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
@@ -22,7 +22,10 @@
     ((function(){
         var editor = CodeMirror.fromTextArea(document.getElementById('frontmatter'), {
             mode: 'yaml',
-            theme: 'paper'
+            theme: 'paper',
+            indentUnit: 4,
+            indentWithTabs: false,
+            extraKeys: {Tab: function(cm) { cm.replaceSelection("    ", "end"); }}
         });
         editor.on('change', editor.save);