diff --git a/lib/gollum/file_view.rb b/lib/gollum/file_view.rb
index 2be5071a..1e329239 100644
--- a/lib/gollum/file_view.rb
+++ b/lib/gollum/file_view.rb
@@ -65,7 +65,7 @@ module Gollum
       if (count - folder_start == 1)
         page = @pages[ folder_start ]
         name = page.name
-        url  = page.filename_stripped
+        url  = ::File.join(::File.dirname(page.path), page.filename_stripped)
         html += <<-HTML
         <li>
           <label>#{::File.dirname(page.path)}</label> <input type="checkbox" checked />
diff --git a/test/file_view/1_file_1_folder.txt b/test/file_view/1_file_1_folder.txt
index ead7f704..9f803328 100644
--- a/test/file_view/1_file_1_folder.txt
+++ b/test/file_view/1_file_1_folder.txt
@@ -2,7 +2,7 @@
         <li>
           <label>folder0</label> <input type="checkbox" checked />
           <ol>
-            <li class="file"><a href="0">0</a></li>
+            <li class="file"><a href="folder0/0">0</a></li>
          </ol>
         </li>
 </ol>
\ No newline at end of file
diff --git a/test/file_view/1_folder.txt b/test/file_view/1_folder.txt
index f960bee7..3893332e 100644
--- a/test/file_view/1_folder.txt
+++ b/test/file_view/1_folder.txt
@@ -2,7 +2,7 @@
         <li>
           <label>.</label> <input type="checkbox" checked />
           <ol>
-            <li class="file"><a href="folder0">folder0</a></li>
+            <li class="file"><a href="./folder0">folder0</a></li>
          </ol>
         </li>
 </ol>
\ No newline at end of file