diff --git a/ghost/admin/app/templates/posts-loading.hbs b/ghost/admin/app/templates/posts-loading.hbs
index 05aa2e07f6..7105c42af6 100644
--- a/ghost/admin/app/templates/posts-loading.hbs
+++ b/ghost/admin/app/templates/posts-loading.hbs
@@ -1,12 +1,32 @@
-<section class="gh-view">
+<section class="gh-view gh-content-view-container">
     <header class="view-header">
         {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Content</span>{{/gh-view-title}}
         <section class="view-actions">
-            {{#link-to "editor.new" class="btn btn-green" title="New Post"}}New Post{{/link-to}}
+            {{link-to "New Post" "editor.new" class="btn btn-green" title="New Post"}}
         </section>
     </header>
 
+    <section class="basic-filter">
+        <ul>
+            <li>
+                {{link-to "All" "posts.index" (query-params type=null) data-test-all-filter-link=true}}
+            </li>
+            <li>
+                {{link-to "Drafts" "posts.index" (query-params type="draft") data-test-drafts-filter-link=true}}
+            </li>
+            <li>
+                {{link-to "Published" "posts.index" (query-params type="published") data-test-published-filter-link=true}}
+            </li>
+            <li>
+                {{link-to "Scheduled" "posts.index" (query-params type="scheduled") data-test-scheduled-filter-link=true}}
+            </li>
+            <li>
+                {{link-to "Pages" "posts.index" (query-params type="page") data-test-pages-filter-link=true}}
+            </li>
+        </ul>
+    </section>
+
     <div class="view-container">
         {{gh-loading-spinner}}
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs
index 74b673a5e1..55d7099906 100644
--- a/ghost/admin/app/templates/posts.hbs
+++ b/ghost/admin/app/templates/posts.hbs
@@ -2,38 +2,26 @@
     <header class="view-header">
         {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Content</span>{{/gh-view-title}}
         <section class="view-actions">
-            {{#link-to "editor.new" class="btn btn-green" title="New Post" data-test-new-post-button=true}}
-                New Post
-            {{/link-to}}
+            {{link-to "New Post" "editor.new" class="btn btn-green" title="New Post" data-test-new-post-button=true}}
         </section>
     </header>
 
     <section class="basic-filter">
         <ul>
             <li>
-                {{#link-to "posts.index" (query-params type=null) data-test-all-filter-link=true}}
-                    All
-                {{/link-to}}
+                {{link-to "All" "posts.index" (query-params type=null) data-test-all-filter-link=true}}
             </li>
             <li>
-                {{#link-to "posts.index" (query-params type="draft") data-test-drafts-filter-link=true}}
-                    Drafts
-                {{/link-to}}
+                {{link-to "Drafts" "posts.index" (query-params type="draft") data-test-drafts-filter-link=true}}
             </li>
             <li>
-                {{#link-to "posts.index" (query-params type="published") data-test-published-filter-link=true}}
-                    Published
-                {{/link-to}}
+                {{link-to "Published" "posts.index" (query-params type="published") data-test-published-filter-link=true}}
             </li>
             <li>
-                {{#link-to "posts.index" (query-params type="scheduled") data-test-scheduled-filter-link=true}}
-                    Scheduled
-                {{/link-to}}
+                {{link-to "Scheduled" "posts.index" (query-params type="scheduled") data-test-scheduled-filter-link=true}}
             </li>
             <li>
-                {{#link-to "posts.index" (query-params type="page") data-test-pages-filter-link=true}}
-                    Pages
-                {{/link-to}}
+                {{link-to "Pages" "posts.index" (query-params type="page") data-test-pages-filter-link=true}}
             </li>
         </ul>
     </section>