diff --git a/default.hbs b/default.hbs
index adc6a4621e..ecb7cdc511 100644
--- a/default.hbs
+++ b/default.hbs
@@ -87,6 +87,7 @@
             <nav class="site-footer-nav">
                 {{navigation type="secondary"}}
             </nav>
+            {{{block "edit-link"}}}
         </div>
     </footer>
 
diff --git a/page.hbs b/page.hbs
index 216c17706c..82851cafe2 100644
--- a/page.hbs
+++ b/page.hbs
@@ -43,4 +43,7 @@ into the {body} tag of the default.hbs template --}}
 </article>
 </main>
 
+{{#contentFor "edit-link"}}
+<a href="/ghost/#/editor/page/{{id}}">Edit</a>
+{{/contentFor}}
 {{/post}}
\ No newline at end of file
diff --git a/post.hbs b/post.hbs
index 326babe8d0..93019fa28b 100644
--- a/post.hbs
+++ b/post.hbs
@@ -119,4 +119,7 @@ into the {body} tag of the default.hbs template --}}
     {{/get}}
 {{/if}}
 
+{{#contentFor "edit-link"}}
+<a href="/ghost/#/editor/post/{{id}}">Edit</a>
+{{/contentFor}}
 {{/post}}
\ No newline at end of file