diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb
index acc9ac8b4..49a7fe12b 100644
--- a/app/views/posts/partials/common/_search.html.erb
+++ b/app/views/posts/partials/common/_search.html.erb
@@ -6,7 +6,7 @@
 <section id="search-box">
   <h1>Search</h1>
   <%= form_tag(path, :method => "get") do %>
-    <%= text_field_tag("tags", tags, :size => 20, :id => tags_dom_id, :data => { :autocomplete => "tag-query" }) %>
+    <%= text_area_tag("tags", tags, :rows => 1, :cols => 15, :id => tags_dom_id, :data => { :autocomplete => "tag-query" }) %>
     <% if params[:raw] %>
       <%= hidden_field_tag :raw, params[:raw] %>
     <% end %>
@@ -28,3 +28,15 @@
     </div>
   <% end %>
 </section>
+
+<%= content_for(:html_header) do %>
+<script>
+  $(function() {
+    $("#tags").scroll(function(e) {
+      var rows = parseInt($(e.target).attr("rows"));
+      $(e.target).attr('rows', rows + 1);
+      $(e.target).css("width", "100%");
+    });
+  });
+</script>
+<% end %>
\ No newline at end of file