diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index 03ba9cdf..7a987322 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -329,13 +329,15 @@ module Precious
     end
 
     get '/fileview' do
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      show_all = settings.wiki_options[:show_all]
+      wiki = wiki_new
+      options = settings.wiki_options
+      content = wiki.pages
       # if showing all files include wiki.files
-      # must pass wiki_options for both because
+      content += wiki.files if options[:show_all]
+
+      # must pass wiki_options to FileView
       # --show-all and --collapse-tree can be set.
-      @results = show_all ? Gollum::FileView.new(wiki.pages + wiki.files, settings.wiki_options).render_files :
-                            Gollum::FileView.new(wiki.pages, settings.wiki_options).render_files
+      @results = Gollum::FileView.new(content, options).render_files
       @ref = wiki.ref
       mustache :file_view, { :layout => false }
     end