diff --git a/_includes/sidebar-toc-glossary.html b/_includes/sidebar-toc-glossary.html
index 99ab07327d..348010d964 100644
--- a/_includes/sidebar-toc-glossary.html
+++ b/_includes/sidebar-toc-glossary.html
@@ -5,6 +5,6 @@ <h5 class="contents">Terms</h5>
       <div id="toc"></div>
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
diff --git a/_includes/sidebar-toc-multipage-overview.html b/_includes/sidebar-toc-multipage-overview.html
index dff5dbce65..a6a93713b4 100644
--- a/_includes/sidebar-toc-multipage-overview.html
+++ b/_includes/sidebar-toc-multipage-overview.html
@@ -46,6 +46,6 @@ <h5 class="contents">Contents</h5>
       {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
diff --git a/_includes/sidebar-toc-singlepage-overview.html b/_includes/sidebar-toc-singlepage-overview.html
index 979ce5b83f..d043aa83c2 100644
--- a/_includes/sidebar-toc-singlepage-overview.html
+++ b/_includes/sidebar-toc-singlepage-overview.html
@@ -26,6 +26,6 @@ <h5 class="contents">Contents</h5>
       {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
diff --git a/_includes/sidebar-toc-style.html b/_includes/sidebar-toc-style.html
index a40f16e9d6..f326a5e71b 100644
--- a/_includes/sidebar-toc-style.html
+++ b/_includes/sidebar-toc-style.html
@@ -52,7 +52,7 @@ <h5 class="contents">Contents</h5>
     {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
 	{% endif %}
diff --git a/_includes/sidebar-toc-tour-overview.html b/_includes/sidebar-toc-tour-overview.html
index 7b4a67421f..4731108069 100644
--- a/_includes/sidebar-toc-tour-overview.html
+++ b/_includes/sidebar-toc-tour-overview.html
@@ -44,6 +44,6 @@ <h5 class="contents">Contents</h5>
       {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
diff --git a/_includes/sidebar-toc.html b/_includes/sidebar-toc.html
index a40f16e9d6..f326a5e71b 100644
--- a/_includes/sidebar-toc.html
+++ b/_includes/sidebar-toc.html
@@ -52,7 +52,7 @@ <h5 class="contents">Contents</h5>
     {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
 	{% endif %}
diff --git a/_includes/tutorial-toc.html b/_includes/tutorial-toc.html
index 8e319214fc..00858076f3 100644
--- a/_includes/tutorial-toc.html
+++ b/_includes/tutorial-toc.html
@@ -24,6 +24,6 @@ <h5>Contents</h5>
       {% include tutorial-tour-list.txt %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
diff --git a/_layouts/sip.html b/_layouts/sip.html
index 602908c669..401bc31884 100644
--- a/_layouts/sip.html
+++ b/_layouts/sip.html
@@ -26,7 +26,7 @@ <h5 class="contents">SIP Contents</h5>
           <div id="toc"></div>
     		</div>
     		<hr>
-    		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+    		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
     	</div>
     </div>
 
diff --git a/_layouts/sips.html b/_layouts/sips.html
index de56422599..9f5d5d06ee 100644
--- a/_layouts/sips.html
+++ b/_layouts/sips.html
@@ -40,7 +40,7 @@ <h5 class="contents" style="margin-bottom: 0;">Writing a SIP</h5>
           <li><a href="{{ site.baseurl }}/sips/sip-submission.html">Submitting a SIP</a></li>
           <li><a href="{{ site.baseurl }}/sips/sip-tutorial.html">Tutorial: Writing a SIP</a></li>
         </ul>
-    		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+    		<div class="help-us"><a href="https://github.com/scala/scala.github.com/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
     	</div>
     </div>
 
