diff --git a/lib/gollum/frontend/views/pages.rb b/lib/gollum/frontend/views/pages.rb
index a16a7fda..6bf95721 100644
--- a/lib/gollum/frontend/views/pages.rb
+++ b/lib/gollum/frontend/views/pages.rb
@@ -5,10 +5,6 @@ module Precious
     class Pages < Layout
       attr_reader :results, :ref
 
-      def prefix
-        @base_url ? @base_url.chomp('/') + '/' : '/'
-      end
-
       def title
         "All pages in #{@ref}"
       end
@@ -16,14 +12,14 @@ module Precious
       def breadcrumb
         if @path
           path = Pathname.new(@path)
-          breadcrumb = [%{<a href="#{prefix}pages/">Home</a>}]
+          breadcrumb = [%{<a href="#{@base_url}/pages/">Home</a>}]
           path.descend do |crumb|
             title = crumb.basename
 
             if title == path.basename
               breadcrumb << title
             else
-              breadcrumb << %{<a href="#{prefix}pages/#{crumb}/">#{title}</a>}
+              breadcrumb << %{<a href="#{@base_url}/pages/#{crumb}/">#{title}</a>}
             end
           end
 
@@ -43,7 +39,7 @@ module Precious
             if page_path.include?('/')
               folder      = page_path.split('/').first
               folder_path = @path ? "#{@path}/#{folder}" : folder
-              folder_link = %{<li><a href="#{prefix}pages/#{folder_path}/" class="folder">#{folder}</a></li>}
+              folder_link = %{<li><a href="#{@base_url}/pages/#{folder_path}/" class="folder">#{folder}</a></li>}
 
               unless folder_links.include?(folder_link)
                 folder_links << folder_link
@@ -51,7 +47,7 @@ module Precious
                 folder_link
               end
             elsif page_path != ".gitkeep"
-              %{<li><a href="#{prefix}#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
+              %{<li><a href="#{@base_url}/#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
             end
           }.compact.join("\n")
         else
diff --git a/test/test_pages_view.rb b/test/test_pages_view.rb
index bf700e55..07093ed5 100644
--- a/test/test_pages_view.rb
+++ b/test/test_pages_view.rb
@@ -19,7 +19,7 @@ context "Precious::Views::Pages" do
 
   test "breadcrumb" do
     @page.instance_variable_set("@path", "Mordor/Eye-Of-Sauron/Saruman")
-    @page.instance_variable_set("@base_url", "/")
+    @page.instance_variable_set("@base_url", "")
     assert_equal '<a href="/pages/">Home</a> / <a href="/pages/Mordor/">Mordor</a> / <a href="/pages/Mordor/Eye-Of-Sauron/">Eye-Of-Sauron</a> / Saruman', @page.breadcrumb
   end
 
@@ -29,7 +29,7 @@ context "Precious::Views::Pages" do
 
   test "files_folders" do
     @page.instance_variable_set("@path", "Mordor")
-    @page.instance_variable_set("@base_url", "/")
+    @page.instance_variable_set("@base_url", "")
     results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
     @page.instance_variable_set("@results", results)
     assert_equal %{<li><a href="/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders