diff --git a/app/views/posts/_form.haml b/app/views/posts/_form.haml
index 40ba60c4..722c7513 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.template_values_for(template)
+      - value = @post.get_front_matter(template)
       - case type
       - when 'text'
         = text_field 'post', template,
@@ -89,9 +89,10 @@
       - when 'text_area'
         = text_area_tag name, value, class: 'form-control'
       - when 'check_box'
-        = check_box_tag name, value: value, class: 'form-control'
+        = hidden_field 'post', template, value: 'false'
+        = check_box_tag name, 'true', value == 'true', class: 'form-control'
       - when 'select'
-        = select_tag name, options_for_select(value, @post.get_front_matter(template)),
+        = select_tag name, options_for_select(@post.template_values_for(template), value),
           { class: 'form-control select2',
           multiple: @post.template_multiple_values?(template) }
   .form-group