diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
index 74dd65740..13316625f 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
@@ -145,8 +145,10 @@ namespace Orchard.Blogs.Controllers {
             if (post == null)
                 return new NotFoundResult();
 
-            var model = new BlogPostEditViewModel { Blog = blog, BlogPost = null };
-            //model.EditorModel = _contentManager.BuildEditorModel(model.Post.ContentItem, null);
+            var model = new BlogPostEditViewModel {
+                BlogPost = _contentManager.BuildEditorModel(post, null)
+            };
+
             return View(model);
         }
 
@@ -166,8 +168,9 @@ namespace Orchard.Blogs.Controllers {
             if (post == null)
                 return new NotFoundResult();
 
-            var model = new BlogPostEditViewModel { Blog = blog, BlogPost = null };
-            //model.EditorModel = _contentManager.UpdateEditorModel(model.Post, null, this);
+            var model = new BlogPostEditViewModel {
+                BlogPost = _contentManager.UpdateEditorModel(post, null, this)
+            };
 
             IValueProvider values = input.ToValueProvider();
             TryUpdateModel(model, values);
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs
index d5bac199d..821e1c081 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs
@@ -4,7 +4,6 @@ using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {
     public class BlogPostEditViewModel : AdminViewModel {
-        public Blog Blog { get; set; }
         public ItemEditorModel<BlogPost> BlogPost { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx
index 2a1730459..033dacca6 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx
@@ -6,6 +6,6 @@
     <h2>Edit Post</h2>
     <% using (Html.BeginForm()) { %>
         <%=Html.ValidationSummary() %>
-        <%=Html.EditorForModel() %>
+        <%=Html.EditorForItem(m => m.BlogPost) %>
     <% } %>
 <% Html.Include("AdminFoot"); %>
\ No newline at end of file