diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index f6008d13..0522387c 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -625,7 +625,23 @@ module Precious
 
     def show_page_or_file(fullpath)
       wiki = wiki_new
-      if page = wiki.page(fullpath)
+      if page = fullpath[-1] != '/' ? wiki.page("#{fullpath}/#{wiki.index_page}") : false
+        @page          = page
+        @name          = page.filename_stripped
+        @content       = page.formatted_data
+        @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
+
+        # Extensions and layout data
+        @editable      = true
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
+        @allow_uploads = wiki.allow_uploads
+        @navbar        = true
+        mustache :page
+        #redirect_path = "#{fullpath}/#{wiki.index_page}"
+        #redirect to("#{encodeURIComponent(redirect_path)}")
+      elsif page = wiki.page(fullpath)
         @page          = page
         @name          = page.filename_stripped
         @content       = page.formatted_data