diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 77354be1..078e16f8 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -54,9 +54,11 @@ class PostsController < ApplicationController
 
   def new
     authorize Post
-    @post = site.posts(lang: locale).build(layout: params[:layout])
 
-    breadcrumb I18n.t('loaf.breadcrumbs.posts.new', layout: @post.layout.humanized_name.downcase), ''
+    layout = site.layouts[params[:layout].to_sym]
+    @post = Post.build(locale: locale, layout: layout, site: site)
+
+    breadcrumb I18n.t('loaf.breadcrumbs.posts.new', layout: layout.humanized_name.downcase), ''
   end
 
   def create