diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb
index eeb633bb..f39b541b 100644
--- a/lib/gollum/wiki.rb
+++ b/lib/gollum/wiki.rb
@@ -468,7 +468,7 @@ module Gollum
       args = [{}, '-i', '-c', query, @ref, '--']
       args << '--' << @page_file_dir if @page_file_dir
 
-      @repo.git.grep(*args).split("\n").map! do |line|
+      results = @repo.git.grep(*args).split("\n").map! do |line|
         result = line.split(':')
         file_name = result[1].gsub( ::File.extname(result[1]), '' )
 
@@ -477,6 +477,16 @@ module Gollum
           :name   => file_name
         }
       end
+
+      # Use git ls-files '*query*' to search for file names. Grep only searches file content.
+      results += @repo.git.ls_files({}, "*#{ query }*").split("\n").map! do |line|
+        {
+          :count  => 1,
+          :name   => line
+        }
+      end
+
+      results
     end
 
     # Public: All of the versions that have touched the Page.