diff --git a/lib/gollum/templates/search.mustache b/lib/gollum/templates/search.mustache
index b2c30b05..1b04a528 100644
--- a/lib/gollum/templates/search.mustache
+++ b/lib/gollum/templates/search.mustache
@@ -13,9 +13,8 @@
   <div class="Box-header border-bottom p-0"></div>
   {{#results}}
     <li class="Box-row Box-row--gray">
-            <span class="Counter Counter--gray tooltipped tooltipped-w" aria-label="{{filename_count}} hits in filename - {{count}} hits in content">{{filename_count}} - {{count}}</span>&nbsp;
-
-      <span class="text-bold"><a href="{{base_url}}/{{name}}">{{name}}</a></span>
+      <span class="Counter Counter--gray tooltipped tooltipped-w" aria-label="{{filename_count}} hits in filename - {{count}} hits in content">{{filename_count}} - {{count}}</span>&nbsp;
+      <span class="text-bold"><a href="{{href}}">{{name}}</a></span>
       <button class="btn-link tooltipped tooltipped-w float-right toggle-context" aria-label="Show all {{count}} hits in this page">{{#octicon}}search{{/octicon}}</button>
     </li>
 
diff --git a/lib/gollum/views/search.rb b/lib/gollum/views/search.rb
index ca075f70..05da778f 100644
--- a/lib/gollum/views/search.rb
+++ b/lib/gollum/views/search.rb
@@ -5,7 +5,7 @@ module Precious
       include Pagination
 
       def results
-        @results.sort do |a, b|
+        sorted = @results.sort do |a, b|
           if b.nil?
             b_filename_count = 0
             b_count          = 0
@@ -15,6 +15,7 @@ module Precious
           end
           [a[:filename_count], a[:count]] <=> [b_filename_count, b_count]
         end.reverse.slice((@page_num - 1) * @max_count, @max_count)
+        sorted.each {|x| x[:href] = page_route(x[:name])}
       end
 
       def query_string