diff --git a/app/assets/stylesheets/common/tables.css.scss b/app/assets/stylesheets/common/tables.css.scss
index 3658546ec..5d61d6852 100644
--- a/app/assets/stylesheets/common/tables.css.scss
+++ b/app/assets/stylesheets/common/tables.css.scss
@@ -39,3 +39,19 @@ table.striped {
     background-color: #FAFAFA;
   }
 }
+
+table.search {
+  tr {
+    height: 2em;
+  }
+
+  th {
+    text-align: right;
+    padding-right: 1em;
+    vertical-align: top;
+  }
+
+  td {
+    vertical-align: top;
+  }
+}
diff --git a/app/assets/stylesheets/specific/tags.css.scss b/app/assets/stylesheets/specific/tags.css.scss
index db7efa08c..3b7ea1f6b 100644
--- a/app/assets/stylesheets/specific/tags.css.scss
+++ b/app/assets/stylesheets/specific/tags.css.scss
@@ -1,5 +1,5 @@
 div#c-tags {
-  div#a-index {
+  div#a-index table.striped {
     td:nth-child(1), th:nth-child(1) {
       width: 5em;
       text-align: right;
diff --git a/app/views/tags/_search.html.erb b/app/views/tags/_search.html.erb
new file mode 100644
index 000000000..ffb504120
--- /dev/null
+++ b/app/views/tags/_search.html.erb
@@ -0,0 +1,46 @@
+<table class="search">
+  <tbody>
+    <%= form_tag(tags_path, :method => :get, :class => "simple_form") do %>
+      <tr>
+        <th><label for="search_name">Name</label></th>
+        <td>
+          <div class="input">
+            <%= text_field "search", "name_matches" %>
+            <span class="hint">Use * for wildcard</span>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_category">Category</label></th>
+        <td>
+          <div class="input">
+            <%= select "search", "category", [""] + Danbooru.config.canonical_tag_category_mapping.to_a %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_sort">Sort</label></th>
+        <td>
+          <div class="input">
+            <%= select "search", "sort", %w(count date name) %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_hide_empty">Hide Empty</label></th>
+        <td>
+          <div class="input">
+            <%= check_box "search", "hide_empty", {:checked => true}, "yes", "no" %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td><%= submit_tag "Search" %><td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/tags/_secondary_links.html.erb b/app/views/tags/_secondary_links.html.erb
index ea6d62d86..33b6b8e7d 100644
--- a/app/views/tags/_secondary_links.html.erb
+++ b/app/views/tags/_secondary_links.html.erb
@@ -2,7 +2,6 @@
   <menu>
     <li><%= render "tags/quick_search" %></li>
     <li><%= link_to "Listing", tags_path %></li>
-    <li><%= link_to "Search", search_tags_path %></li>
     <li><%= link_to "Help", wiki_pages_path(:search => {:title => "help:tags"}) %></li>
     <% if @tag %>
       <li>|</li>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 3b78ca6e1..544b19012 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,5 +1,6 @@
 <div id="c-tags">
   <div id="a-index">
+    <%= render "search" %>
     <table class="striped">
       <thead>
         <tr>
diff --git a/app/views/tags/search.html.erb b/app/views/tags/search.html.erb
deleted file mode 100644
index 9f87e1f48..000000000
--- a/app/views/tags/search.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="c-tags">
-  <div id="a-search">
-    <%= form_tag(tags_path, :method => :get, :class => "simple_form") do %>
-      <div class="input">
-        <label for="search_name">Name</label>
-        <%= text_field "search", "name_matches" %>
-        <span class="hint">Use * for wildcard</span>
-      </div>
-
-      <div class="input">
-        <label for="search_category">Category</label>
-        <%= select "search", "category", [""] + Danbooru.config.canonical_tag_category_mapping.to_a %>
-      </div>
-
-      <div class="input">
-        <label for="search_hide_empty">Hide Empty</label>
-        <%= select "search", "hide_empty", ["yes", "no"] %>
-      </div>
-
-      <div class="input">
-        <label for="search_sort">Sort</label>
-        <%= select "search", "sort", %w(date name count) %>
-      </div>
-
-      <%= submit_tag "Search" %>
-    <% end %>
-  </div>
-</div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Tags - <%= Danbooru.config.app_name %>
-<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 49c2d59bb..4e8cd6180 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -160,9 +160,6 @@ Danbooru::Application.routes.draw do
   resource :source, :only => [:show]
   resources :tags do
     resource :correction, :only => [:new, :create, :show], :controller => "TagCorrections"
-    collection do
-      get :search
-    end
   end
   resources :tag_aliases do
     resource :correction, :only => [:create, :new, :show], :controller => "TagAliasCorrections"