diff --git a/app/views/posts/_form.haml b/app/views/posts/_form.haml
index 722c751..f2792d9 100644
--- a/app/views/posts/_form.haml
+++ b/app/views/posts/_form.haml
@@ -80,7 +80,7 @@
     .form-group
       = label_tag "post_#{template}", template.humanize
       - name = "post[#{template}]"
-      - value = @post.get_front_matter(template)
+      - value = @post.new? ? @post.template_values_for(template) : @post.get_front_matter(template)
       - case type
       - when 'text'
         = text_field 'post', template,
@@ -92,7 +92,7 @@
         = hidden_field 'post', template, value: 'false'
         = check_box_tag name, 'true', value == 'true', class: 'form-control'
       - when 'select'
-        = select_tag name, options_for_select(@post.template_values_for(template), value),
+        = select_tag name, options_for_select(@post.template_values_for(template), @post.get_front_matter(template)),
           { class: 'form-control select2',
           multiple: @post.template_multiple_values?(template) }
   .form-group