diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss
index 6dd4bce605f..bad54a1da87 100644
--- a/sass/custom/_paulus.scss
+++ b/sass/custom/_paulus.scss
@@ -203,10 +203,6 @@ p.note {
   }
 }
 
-#site-search .search {
-  width: calc(100% - 36px);
-}
-
 .install-instructions-container {
   #normal-install, #raspberry-install, #docker-install, .install-instructions {
     display: none;
@@ -404,3 +400,7 @@ p.note {
     height: 100%;
   }
 }
+
+.edit-github {
+  text-align: right;
+}
diff --git a/source/_includes/asides/component_navigation.html b/source/_includes/asides/component_navigation.html
index 9a040bf2658..0bb8f074e01 100644
--- a/source/_includes/asides/component_navigation.html
+++ b/source/_includes/asides/component_navigation.html
@@ -1,5 +1,7 @@
 {% assign components = site.components | sort: 'title' %}
 <section class="aside-module grid__item one-whole lap-one-half">
+  {% include edit_github.html %}
+
   <div class='brand-logo-container section'>
     {% if page.logo %}
       <img src='/images/supported_brands/{{ page.logo }}' />
diff --git a/source/_includes/edit_github.html b/source/_includes/edit_github.html
new file mode 100644
index 00000000000..22c4a524ce9
--- /dev/null
+++ b/source/_includes/edit_github.html
@@ -0,0 +1 @@
+<div class='edit-github'><a href='https://github.com/balloob/home-assistant.io/tree/master/source/{{ page.path }}'>Edit this page on GitHub</a></div>
\ No newline at end of file
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
index d05fea2feee..c4f667776a0 100644
--- a/source/_layouts/page.html
+++ b/source/_layouts/page.html
@@ -4,6 +4,8 @@ layout: default
 
 <article class="page">
 
+  {% include edit_github.html %}
+
   {% if page.title and page.show_title != false %}
   <header>
     <h1 class="title indent">