diff --git a/app/views/tags/_search.html.erb b/app/views/tags/_search.html.erb
index 1fc0ae8c0..0686a75a5 100644
--- a/app/views/tags/_search.html.erb
+++ b/app/views/tags/_search.html.erb
@@ -1,64 +1,9 @@
-<table class="search">
-  <tbody>
-    <%= form_tag(tags_path, :method => :get, :class => "simple_form") do %>
-      <tr>
-        <th><label for="search_name_matches">Name</label></th>
-        <td>
-          <div class="input">
-            <%= text_field "search", "name_matches", :value => params[: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, :selected => params[:search][:category] %>
-          </div>
-        </td>
-      </tr>
-
-      <tr>
-        <th><label for="search_order">Order</label></th>
-        <td>
-          <div class="input">
-            <%= select "search", "order", %w(count date name), :selected => params[:search][:order] %>
-          </div>
-        </td>
-      </tr>
-
-      <tr>
-        <th><label for="search_hide_empty">Hide Empty</label></th>
-        <td>
-          <div class="input">
-            <%= select "search", "hide_empty", ["yes", "no"], :selected => params[:search][:hide_empty] %>
-          </div>
-        </td>
-      </tr>
-
-      <tr>
-        <th><label for="search_has_wiki">Has a Wiki Page</label></th>
-        <td>
-          <div class="input">
-            <%= select "search", "has_wiki", ["yes", "no"], :selected => params[:search][:has_wiki], :include_blank => true %>
-          </div>
-        </td>
-      </tr>
-
-      <tr>
-        <th><label for="search_has_artist">Has an Artist Entry</label></th>
-        <td>
-          <div class="input">
-            <%= select "search", "has_artist", ["yes", "no"], :selected => params[:search][:has_artist], :include_blank => true %>
-          </div>
-        </td>
-      </tr>
-
-      <tr>
-        <td><%= submit_tag "Search" %><td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<%= simple_form_for(:search, url: tags_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+  <%= f.input :name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:name_matches] } %>
+  <%= f.input :category, label: "Category", collection: Danbooru.config.canonical_tag_category_mapping.to_a, include_blank: true,selected: params[:search][:category] %>
+  <%= f.input :order, collection: [%w[Newest date], %w[Count count], %w[Name name]], include_blank: false, selected: params[:search][:order] %>
+  <%= f.input :hide_empty, label: "Hide empty?", collection: %w[yes no], selected: params[:search][:hide_empty] %>
+  <%= f.input :has_wiki, label: "Has wiki?", collection: %w[yes no], include_blank: true, selected: params[:search][:has_wiki] %>
+  <%= f.input :has_artist, label: "Has artist?", collection: %w[yes no], include_blank: true, selected: params[:search][:has_artist] %>
+  <%= f.submit "Search" %>
+<% end %>