diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index d6ea9bbe..6ba4d92d 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -14,7 +14,7 @@
 
   <script>
   var criticMarkup = '{{critic_markup}}';
-	var baseUrl = '{{base_url}}';
+	var baseUrl = '{{page_route}}';
 	var uploadDest = 'uploads';
 	var perPageUploads = '{{per_page_uploads}}';
 	if (perPageUploads == 'true') {
diff --git a/lib/gollum/templates/navbar.mustache b/lib/gollum/templates/navbar.mustache
index 3f246a8e..4b71a4bf 100644
--- a/lib/gollum/templates/navbar.mustache
+++ b/lib/gollum/templates/navbar.mustache
@@ -2,7 +2,7 @@
 	
 	<div class="TableObject">
 		<div class="TableObject-item">
-	    <a class="btn" id="minibutton-home" href="{{base_url}}/">Home</a>
+	    <a class="btn" id="minibutton-home" href="{{page_route}}">Home</a>
 	  </div>
 
 
diff --git a/lib/gollum/views/overview.rb b/lib/gollum/views/overview.rb
index 9eb3a715..67a66c60 100644
--- a/lib/gollum/views/overview.rb
+++ b/lib/gollum/views/overview.rb
@@ -52,7 +52,7 @@ module Precious
               folder_url  = "#{overview_path}/#{folder_path}/"
               files_and_folders << {name: folder_name, icon: rocticon('file-directory'), type: 'dir', url: folder_url, is_file: false}
             elsif result_path != '.gitkeep'
-              file_url = "#{@base_url}/#{result.escaped_url_path}"
+              file_url = page_route(result.escaped_url_path)
               files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, is_file: true}
             end
           end