diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index 8e4fdde5f..fd317b4dd 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -448,9 +448,16 @@ def find_file(name)
     # is found.
     def find_page_from_name(cname)
       slash = cname.rindex('/')
-      name = cname[slash+1..-1]
-      path = cname[0..slash]
-      if page = @wiki.paged(name, path)
+
+      unless slash.nil?
+        name = cname[slash+1..-1]
+        path = cname[0..slash]
+        page = @wiki.paged(name, path)
+      else
+        page = @wiki.page(cname)
+      end
+
+      if page
         return page
       end
       if pos = cname.index('#')