diff --git a/config.toml b/config.toml
index c612e96938f..51d2eb5db80 100644
--- a/config.toml
+++ b/config.toml
@@ -14,6 +14,8 @@ pygmentsCodeFencesGuessSyntax=true
 
 [params]
   addThis = "ra-5af1cc6793d86bfb"
+  ### Edit content repo (set to automatically enter "edit" mode; this is good for "improve this page" links)
+  ghdocsrepo = "https://github.com/rancher/docs"
 
 [outputFormats.Search]
 baseName = "search"
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0c7b4d198ae..5b252d9b413 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -88,6 +88,8 @@
         </div>
         {{ template "_internal/pagination.html" . }}
         {{ partial "breadcrumbs.html" . }}
+
+        <div class="p-v-xs">{{ partial "page-edit.html" . }}</div>
       </article>
       <div class="offset-watch invisible"></div>
       <aside class="col-sm-3 col-xs-12 unstyled toc-container hidden-md">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 8abfd890666..55be91ffd35 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -40,6 +40,8 @@
 
       </div>
         {{ partial "breadcrumbs.html" . }}
+
+         <div class="p-v-sm">{{ partial "page-edit.html" . }}</div>
       </article>
       <div class="offset-watch invisible"></div>
       <aside class="col-sm-3 col-xs-12 unstyled toc-container">
@@ -47,5 +49,8 @@
         {{ .TableOfContents }}
       </aside>
     </div>
+
   </div>
 {{ end }}
+
+
diff --git a/layouts/partials/page-edit.html b/layouts/partials/page-edit.html
new file mode 100755
index 00000000000..ab7b021aab9
--- /dev/null
+++ b/layouts/partials/page-edit.html
@@ -0,0 +1,2 @@
+<a href="{{.Site.Params.ghdocsrepo}}/edit/master/content/{{.File.Path}}" class="btn bg-link">Edit this page <i class="material-icons">
+edit</i></a>