diff --git a/lib/gollum/views/helpers.rb b/lib/gollum/views/helpers.rb
index f82f6062..ccd38ea4 100644
--- a/lib/gollum/views/helpers.rb
+++ b/lib/gollum/views/helpers.rb
@@ -61,7 +61,10 @@ module Precious
         url.compact!
         return nil if url.empty?
 
-        ::File.join(*url).gsub(%r{/{2,}}, '/')
+        _url = ::File.join(*url)
+        _url.gsub!(%r{/{2,}}, '/')
+        _url.gsub!(%r{\?}, '%3F')
+        _url
       end
     end