diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index d4d671aa9..2e2d91fb1 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,7 +1,7 @@
 <h2><%= l(:label_search) %></h2>
 
 <div class="box">
-<%= form_tag({}, :method => :get) do %>
+<%= form_tag({}, :method => :get, :id => 'search-form') do %>
 <%= label_tag "search-input", l(:description_search), :class => "hidden-for-sighted" %>
 <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
 <%= javascript_tag "$('#search-input').focus()" %>
@@ -11,13 +11,14 @@
 <%= hidden_field_tag 'titles_only', '', :id => nil %>
 <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
 </p>
-<p>
+
+<p id="search-types">
 <% @object_types.each do |t| %>
-<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
+<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= link_to type_label(t), "#" %></label>
 <% end %>
 </p>
 
-<p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
+<p><%= submit_tag l(:button_submit) %></p>
 <% end %>
 </div>
 
@@ -50,3 +51,14 @@
 </center></p>
 
 <% html_title(l(:label_search)) -%>
+
+<%= javascript_tag do %>
+$("#search-types a").click(function(e){
+  e.preventDefault();
+  $("#search-types input[type=checkbox]").attr('checked', false);
+  $(this).siblings("input[type=checkbox]").attr('checked', true);
+  if ($("#search-input").val() != "") {
+    $("#search-form").submit();
+  }
+});
+<% end %>