diff --git a/app/controllers/post_versions_controller.rb b/app/controllers/post_versions_controller.rb
index 1dbb6f1fc..0caf636cf 100644
--- a/app/controllers/post_versions_controller.rb
+++ b/app/controllers/post_versions_controller.rb
@@ -3,4 +3,8 @@ class PostVersionsController < ApplicationController
     @search = PostVersion.search(params[:search])
     @post_versions = @search.order("id desc").paginate(params[:page])
   end
+  
+  def search
+    @search = PostVersion.search(params[:search])
+  end
 end
diff --git a/app/views/post_versions/_secondary_links.html.erb b/app/views/post_versions/_secondary_links.html.erb
new file mode 100644
index 000000000..4add9a4fa
--- /dev/null
+++ b/app/views/post_versions/_secondary_links.html.erb
@@ -0,0 +1,8 @@
+<% content_for(:secondary_links) do %>
+  <menu>
+    <li><%= link_to "Posts", posts_path %></li>
+    <li><%= link_to "Upload", new_upload_path %></li>
+    <li><%= link_to "Search", search_post_versions_path %></li>
+    <li><%= link_to "Help", wiki_pages_path(:title => "help:posts") %></li>
+  </menu>
+<% end %>
diff --git a/app/views/post_versions/index.html.erb b/app/views/post_versions/index.html.erb
index 54f0a56fa..e6d9d031b 100644
--- a/app/views/post_versions/index.html.erb
+++ b/app/views/post_versions/index.html.erb
@@ -1,13 +1,5 @@
 <div id="c-post-versions">
   <div id="a-index">
-    <div id="search">
-      <%= simple_form_for(@search) do |f| %>
-        <%= f.input :updater_name_eq, :label => "User" %>
-        <%= f.input :post_id_eq, :label => "Post" %>
-        <%= f.button :submit, :value => "Search" %>
-      <% end %>
-    </div>
-    
     <% if @post_versions.empty? %>
       <%= render "post_sets/blank" %>
     <% else %>
@@ -16,4 +8,4 @@
   </div>
 </div>
 
-<%= render "posts/partials/common/secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
\ No newline at end of file
diff --git a/app/views/post_versions/search.html.erb b/app/views/post_versions/search.html.erb
new file mode 100644
index 000000000..9b52b7762
--- /dev/null
+++ b/app/views/post_versions/search.html.erb
@@ -0,0 +1,13 @@
+<div id="c-post-versions">
+  <div id="a-search">
+    <div id="search">
+      <%= simple_form_for(@search) do |f| %>
+        <%= f.input :updater_name_eq, :label => "User", :required => false %>
+        <%= f.input :post_id_eq, :label => "Post", :required => false %>
+        <%= f.button :submit, :value => "Search" %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<%= render "secondary_links" %>
diff --git a/config/routes.rb b/config/routes.rb
index d6dd7ba42..58793ba53 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -94,8 +94,11 @@ Danbooru::Application.routes.draw do
       put :revert
     end
   end
-
-  resources :post_versions, :only => [:index]
+  resources :post_versions, :only => [:index, :search] do
+    collection do
+      get :search
+    end
+  end
   resources :post_flags, :only => [:new, :index, :create]
   resources :post_appeals, :only => [:new, :index, :create]
   resource  :session