diff --git a/_includes/favicon.html b/_includes/favicon.html
new file mode 100644
index 0000000..c485d4c
--- /dev/null
+++ b/_includes/favicon.html
@@ -0,0 +1 @@
+<link rel="shortcut icon" href="{{ 'favicon.ico' | relative_url }}" type="image/x-icon">
diff --git a/_includes/head.html b/_includes/head.html
index c0f73d7..d26a42a 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -10,7 +10,7 @@
     {% endif %}
   {% endunless %}
 
-  <link rel="shortcut icon" href="{{ 'favicon.ico' | relative_url }}" type="image/x-icon">
+  {% include favicon.html %}
 
   <link rel="stylesheet" href="{{ '/assets/css/just-the-docs-default.css' | relative_url }}">
 
diff --git a/_layouts/default.html b/_layouts/default.html
index 40d85ac..3e988b4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -177,7 +177,7 @@ layout: table_wrappers
                   site.gh_edit_view_mode
                 %}
                   <p class="text-small text-grey-dk-000 mb-0">
-                    <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>
+                    <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}{% if page.collection and site.collections_dir %}/{{ site.collections_dir }}{% endif %}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>
                   </p>
                 {% endif %}
               </div>