diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de5e29eff..f5395acdf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -105,7 +105,12 @@ module ApplicationHelper
   
   def search_field(method, options = {})
     name = options[:label] || method.titleize
-    raw '<div class="input"><label for="search_' + method + '">' + name + '</label><input type="text" name="search[' + method + ']" id="search_'  + method + '"></div>'
+    string = '<div class="input"><label for="search_' + method + '">' + name + '</label><input type="text" name="search[' + method + ']" id="search_'  + method + '">'
+    if options[:hint]
+      string += '<p class="hint">' + options[:hint] + '</p>'
+    end
+    string += '</div>'
+    string.html_safe
   end
   
 protected
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index e8b371480..3183333d2 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -44,7 +44,7 @@ class WikiPage < ActiveRecord::Base
         q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].downcase)
       end
       
-      if params[:sort] == "time"
+      if params[:sort] == "time" || params[:sort] == "Date"
         q = q.order("updated_at desc")
       end
 
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index 7f2130b57..47fbc3f85 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -1,6 +1,7 @@
 <% content_for(:secondary_links) do %>
   <menu>
     <li><%= link_to "Listing", wiki_pages_path %></li>
+    <li><%= link_to "Search", search_wiki_pages_path %></li>
     <li><%= link_to "New", new_wiki_page_path %></li>
     <li><%= link_to "Help", wiki_pages_path(:search => {:title => "help:wiki"}) %></li>
     <% if @wiki_page %>
diff --git a/app/views/wiki_pages/search.html.erb b/app/views/wiki_pages/search.html.erb
new file mode 100644
index 000000000..99494bd4c
--- /dev/null
+++ b/app/views/wiki_pages/search.html.erb
@@ -0,0 +1,22 @@
+<div id="c-wiki-pages">
+  <div id="a-search">
+    <%= form_tag(wiki_pages_path, :method => :get, :class => "simple_form") do %>
+      <%= search_field "title", :hint => "Use * for wildcard searches" %>
+      <%= search_field "creator_name" %>
+      <%= search_field "body_matches", :label => "Body" %>
+      
+      <div class="input">
+        <label for="search_sort">Sort</label>
+        <%= select "search", "sort", ["Name", "Date"] %>
+      </div>
+      
+      <%= submit_tag "Search" %>
+    <% end %>
+  </div>
+</div>
+
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Wiki - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 88f44f2b2..76a8e9c36 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -183,6 +183,7 @@ Danbooru::Application.routes.draw do
       put :revert
     end
     collection do
+      get :search
       get :show_or_new
     end
   end