diff --git a/models/site.rb b/models/site.rb
index 90e420e8..0964ff2e 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -1226,8 +1226,6 @@ class Site < Sequel::Model
       raise ArgumentError, 'invalid character for filename' if c < 32
     end
 
-    # scrub question marks (I should probably just be erroring out for this)
-    clean_path.gsub!('?', '')
     clean_path
   end
 
diff --git a/views/dashboard/files.erb b/views/dashboard/files.erb
index 3a72b6d7..6d7cd3e9 100644
--- a/views/dashboard/files.erb
+++ b/views/dashboard/files.erb
@@ -98,7 +98,7 @@
             <% if file[:is_directory] %>
             <a class="link-overlay" href="?dir=<%= Rack::Utils.escape file[:path] %>" title="View <%= file[:path] %>"></a>
             <% else %>
-            <a class="link-overlay" href="<%= current_site.file_uri file[:path] %>" title="View <%= file[:path] == '/index.html' ? 'your site index' : file[:path] %>" target="_blank"></a>
+            <a class="link-overlay" href="<%= current_site.file_uri Rack::Utils.escape(file[:path]) %>" title="View <%= file[:path] == '/index.html' ? 'your site index' : file[:path] %>" target="_blank"></a>
             <% end %>
           </div>
         </div>