diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a58b24de643..121307ae1f7 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -9,7 +9,7 @@ class SearchController < ApplicationController
     @search_results = if @project
                         return access_denied! unless can?(current_user, :download_code, @project)
 
-                        unless %w(blobs notes issues merge_requests).include?(@scope)
+                        unless %w(blobs notes issues merge_requests wiki_blobs).include?(@scope)
                           @scope = 'blobs'
                         end
 
diff --git a/app/views/search/_project_filter.html.haml b/app/views/search/_project_filter.html.haml
index 36947675d18..57a45c9acb6 100644
--- a/app/views/search/_project_filter.html.haml
+++ b/app/views/search/_project_filter.html.haml
@@ -23,3 +23,9 @@
       Comments
       .pull-right
         = @search_results.notes_count
+  %li{class: ("active" if @scope == 'wiki_blobs')}
+    = link_to search_filter_path(scope: 'wiki_blobs') do
+      Wiki
+      .pull-right
+        = @search_results.wiki_blobs_count
+
diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml
new file mode 100644
index 00000000000..75414d73b0c
--- /dev/null
+++ b/app/views/search/results/_wiki_blob.html.haml
@@ -0,0 +1,9 @@
+.blob-result
+  .file-holder
+    .file-title
+      = link_to project_wiki_path(@project, wiki_blob.filename) do
+        %i.icon-file
+        %strong
+          = wiki_blob.filename
+    .file-content.code.term
+      = render 'shared/file_hljs', blob: wiki_blob, first_line_number: wiki_blob.startline
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 90511662b20..5d959dfe0a5 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -14,13 +14,15 @@ module Gitlab
         notes.page(page).per(per_page)
       when 'blobs'
         Kaminari.paginate_array(blobs).page(page).per(per_page)
+      when 'wiki_blobs'
+        Kaminari.paginate_array(wiki_blobs).page(page).per(per_page)
       else
         super
       end
     end
 
     def total_count
-      @total_count ||= issues_count + merge_requests_count + blobs_count + notes_count
+      @total_count ||= issues_count + merge_requests_count + blobs_count + notes_count + wiki_blobs_count
     end
 
     def blobs_count
@@ -31,6 +33,10 @@ module Gitlab
       @notes_count ||= notes.count
     end
 
+    def wiki_blobs_count
+      @wiki_blobs_count ||= wiki_blobs.count
+    end
+
     private
 
     def blobs
@@ -41,6 +47,14 @@ module Gitlab
       end
     end
 
+    def wiki_blobs
+      if !project.wiki_enabled?
+        []
+      else
+        Repository.new(ProjectWiki.new(project).path_with_namespace).search_files(query)
+      end
+    end
+
     def notes
       Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC')
     end