diff --git a/lib/gollum/frontend/views/pages.rb b/lib/gollum/frontend/views/pages.rb
index ccfdef27..a16a7fda 100644
--- a/lib/gollum/frontend/views/pages.rb
+++ b/lib/gollum/frontend/views/pages.rb
@@ -6,8 +6,7 @@ module Precious
       attr_reader :results, :ref
 
       def prefix
-        return '/' if @base_url.nil?
-        @base_url.chomp('/').empty? ? '/' : @base_url + '/'
+        @base_url ? @base_url.chomp('/') + '/' : '/'
       end
 
       def title
diff --git a/test/test_pages_view.rb b/test/test_pages_view.rb
index bb4bc958..bf700e55 100644
--- a/test/test_pages_view.rb
+++ b/test/test_pages_view.rb
@@ -34,4 +34,13 @@ context "Precious::Views::Pages" do
     @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
   end
+
+  test "base url" do
+    # based on test "files_folders"
+    @page.instance_variable_set("@path", "Mordor")
+    @page.instance_variable_set("@base_url", "/wiki")
+    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="/wiki/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/wiki/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders
+  end
 end