diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 2592d22..af2896f 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -5,11 +5,16 @@ class SearchController < ApplicationController
   before_filter :load_category
   before_filter :prepare_filter
   before_filter :check_search_whole_site
+  before_filter :load_search_assets
 
   no_design_blocks
 
   protected
 
+  def load_search_assets
+    @search_in = SEARCH_IN
+  end
+
   def search(finder, query)
     finder.find_by_contents(query).sort_by do |hit|
       -(relevance_for(hit))
@@ -106,7 +111,6 @@ class SearchController < ApplicationController
   #######################################################
 
   def popup
-    @search_in = SEARCH_IN
     render :action => 'popup', :layout => false
   end
 
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index 8a994e2..8bc0b71 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -1,9 +1,6 @@
-<div id='new-search'>
-<% form_tag(:action => 'index') do %>
-  <%= text_field_tag 'query', @query %>
-  <%= submit_button :search, _('Search') %>
-<% end %>
+<%= render :partial => 'search_form' %>
 
+<div>
 <%= link_to _('Search for "%s" in the whole site') % @query, :controller => 'search', :action => 'index', :category_path => [], :query => @query if @category %>
 </div>
 
diff --git a/app/views/search/popup.rhtml b/app/views/search/popup.rhtml
index d61b360..3386919 100644
--- a/app/views/search/popup.rhtml
+++ b/app/views/search/popup.rhtml
@@ -2,50 +2,7 @@
 
 <h2><%= _('Search %s') % @environment.name %></h2>
 
-<% form_tag({:action => 'index', :category_path => (@category ? @category.explode_path : [])}, :method => 'get') do%>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'query', '', :id => 'popup-search-input', :size => 50 %>
-      <%= javascript_tag '$("popup-search-input").focus()' %>
-    </span>
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-
-  <% if @category %>
-    <h3><%= _('Search in:') %></h3>
-    <ul>
-      <li>
-      <%= radio_button_tag :search_whole_site, 'no', true %>
-      <span><%= _('Only in %{category}') % { :category => @category.full_name } %></span>
-      </li>
-      <li>
-      <%= radio_button_tag :search_whole_site, 'yes' %>
-      <span><%= _('Whole site') %></span>
-      </li>
-    </ul>
-  <% end %>
-
-  <div class="search-options">
-    <h3><%= _('Search for:') %></h3>
-    <ul>
-      <% @search_in.map { |t,n| [t,gettext(n)] } .
-                    sort_by(&:last).each do |thing, name| %>
-        <li>
-        <%= check_box_tag 'find_in[]', thing.to_s, true %>
-        <span><%= name %></span>
-        </li>
-      <% end %>
-    </ul>
-    <br style="clear:both" />
-  </div><!-- fim class="search-options" -->
-
-  <% button_bar do %>
-    <%= submit_button(:search, _('Search')) %>
-    <%= lightbox_close_button(_('Close')) %>
-  <% end %>
-
-<% end %>
+<%= render :partial => 'search_form' %>
 
 <script type='text/javascript'>
   $('query').focus();
diff --git a/public/stylesheets/search.css b/public/stylesheets/search.css
index a1a99b8..080855e 100644
--- a/public/stylesheets/search.css
+++ b/public/stylesheets/search.css
@@ -28,30 +28,30 @@
   text-align: center;
 }
 
-#search-popup .search-options ul,
-#search-popup .search-options li {
+.search-options ul,
+.search-options li {
   margin: 0px;
   padding: 0px;
   list-style: none;
 }
-#search-popup .search-options ul {
+.search-options ul {
   clear: left;
 }
 
-#search-popup .search-options {
+.search-options {
   border: 1px solid #2A5896;
   padding: 0px 0px 5px 20px;
   margin-top: 20px;
 }
 
-#search-popup .search-options h3 {
+.search-options h3 {
   float: left;
   margin: -10px 0px 0px 0px;
   background: #FFF;
   padding: 0px 5px;
 }
 
-#search-popup .search-options li {
+.search-options li {
   float: left;
   width: 33%;
   padding: 2px 0px;
--
libgit2 0.21.2