diff --git a/core/client/templates/posts.hbs b/core/client/templates/posts.hbs
index e74421c3fd..ee8bf8e370 100644
--- a/core/client/templates/posts.hbs
+++ b/core/client/templates/posts.hbs
@@ -8,24 +8,22 @@
         </header>
         <section class="content-list-content">
             <ol class="posts-list">
-                {{#each itemController="posts/post"}}
-                    {{#view "post-item-view" tagName="li" post=this}} <!-- needed because of "active" class on li item -->
-                        {{#link-to 'posts.post' this class="permalink" title="Edit this post"}}
-                            <h3 class="entry-title">{{title}}</h3>
-                            <section class="entry-meta">
-                                <span class="status">
-                                    {{#if isDraft}}
-                                        <span class="draft">Draft</span>
-                                    {{/if}}
-                                    {{#if isPublished}}
-                                        <time datetime="{{unbound published_at}}" class="date published">
-                                            Published {{format-timeago published_at}}
-                                        </time>
-                                    {{/if}}
-                                </span>
-                            </section>
-                        {{/link-to}}
-                    {{/view}}
+                {{#each itemController="posts/post" itemView="post-item-view" itemTagName="li"}}
+                    {{#link-to 'posts.post' this class="permalink" title="Edit this post"}}
+                        <h3 class="entry-title">{{title}}</h3>
+                        <section class="entry-meta">
+                            <span class="status">
+                                {{#if isDraft}}
+                                    <span class="draft">Draft</span>
+                                {{/if}}
+                                {{#if isPublished}}
+                                    <time datetime="{{unbound published_at}}" class="date published">
+                                        Published {{format-timeago published_at}}
+                                    </time>
+                                {{/if}}
+                            </span>
+                        </section>
+                    {{/link-to}}
                 {{/each}}
             </ol>
         </section>
diff --git a/core/client/views/post-item-view.js b/core/client/views/post-item-view.js
index 5e44b3cd02..5bb22846ca 100644
--- a/core/client/views/post-item-view.js
+++ b/core/client/views/post-item-view.js
@@ -2,7 +2,7 @@ import itemView from 'ghost/views/item-view';
 
 var PostItemView = itemView.extend({
     openEditor: function () {
-        this.get('controller').send('openEditor', this.get('post'));  // send action to handle transition to editor route
+        this.get('controller').send('openEditor', this.get('context'));  // send action to handle transition to editor route
     }.on("doubleClick")
 });