diff --git a/app/controllers/comfy/admin/blog/posts_controller.rb b/app/controllers/comfy/admin/blog/posts_controller.rb
index fff6873..155eba4 100644
--- a/app/controllers/comfy/admin/blog/posts_controller.rb
+++ b/app/controllers/comfy/admin/blog/posts_controller.rb
@@ -55,9 +55,10 @@ def load_post
   end
 
   def build_post
+    layout = (@site.blog_posts.order(:created_at).last.try(:layout) || @site.layouts.order(:created_at).first)
     @post = @site.blog_posts.new(post_params)
     @post.published_at ||= Time.zone.now
-    @post.layout ||= (@site.blog_posts.last.try(:layout) || @site.layouts.first)
+    @post.layout ||= layout
   end
 
   def post_params