diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index ddbaaa64..26dd397e 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -341,6 +341,8 @@ module Precious
       path         = extract_path(fullpath)
       wiki         = wiki_new
 
+      path = '/' if path.nil?
+
       if page = wiki.paged(name, path)
         @page = page
         @name = name