diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 9ed2dd21d..88fe08b50 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -121,11 +121,12 @@ module QueriesHelper
   end
 
   def available_display_types_tags(query)
-    available_display_types = []
+    tags = ''.html_safe
     query.available_display_types.each do |t|
-      available_display_types << [l(:"label_display_type_#{t}"), t]
+      tags << radio_button_tag('display_type', t, @query.display_type == t, :id => "display_type_#{t}") +
+        content_tag('label', l(:"label_display_type_#{t}"), :for => "display_type_#{t}")
     end
-    select_tag('display_type', options_for_select(available_display_types, @query.display_type), :id => 'display_type')
+    tags
   end
 
   def grouped_query_results(items, query, &block)
diff --git a/app/views/queries/_query_form.html.erb b/app/views/queries/_query_form.html.erb
index 62d156684..bb29827f8 100644
--- a/app/views/queries/_query_form.html.erb
+++ b/app/views/queries/_query_form.html.erb
@@ -21,7 +21,7 @@
             <%= available_display_types_tags(@query) %>
           </div>
           <% end %>
-          <table id="list" class="<%= 'hidden' if (@query.display_type == 'board') %>">
+          <table id="list-definition" class="<%= 'hidden' if (@query.display_type != 'list') %>">
           <% if @query.available_columns.any? %>
             <tr>
               <td class="field"><%= l(:field_column_names) %></td>
@@ -74,12 +74,11 @@
 
 <%= javascript_tag do %>
 $(function ($) {
-  $('#display_type').change(function (e) {
-    var option = $(e.target).val()
-    if (option == 'board') {
-      $('table#list').hide();
+  $('input[name=display_type]').change(function (e) {
+    if ($("#display_type_list").is(':checked')) {
+      $('table#list-definition').show();
     } else {
-      $('table#list').show();
+      $('table#list-definition').hide();
     }
 
   })