diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index 5593f79b..36088585 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -295,8 +295,9 @@ module Precious
     def show_page_or_file(fullpath)
       path         = extract_path(fullpath)
       name         = extract_name(fullpath)
-      wiki_options = settings.wiki_options.merge({ :page_file_dir => path })
-      wiki         = Gollum::Wiki.new(settings.gollum_path, wiki_options)
+      # This breaks headers, footers, and sidebars.
+      # wiki_options = settings.wiki_options.merge({ :page_file_dir => path })
+      wiki         = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
 
       if page = wiki.page(name)
         @page = page