diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index 6a94712e0..95bdb5fb5 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -1,10 +1,10 @@
 <%= error_messages_for 'query' %>
 
 <div class="box">
-<div class="tabular">
 <%= hidden_field_tag 'gantt', '1' if params[:gantt] %>
 <%= hidden_field_tag 'calendar', '1' if params[:calendar] %>
 
+<div class='tabular'>
 <p><label for="query_name"><%=l(:field_name)%></label>
 <%= text_field 'query', 'name', :size => 80 %></p>
 
@@ -27,9 +27,15 @@
   <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
   <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
 <% end %>
+</div>
+
+<fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
+<%= render :partial => 'queries/filters', :locals => {:query => query}%>
+</fieldset>
 
 <% unless params[:calendar] %>
   <fieldset id="options"><legend><%= l(:label_options) %></legend>
+    <div class='tabular'>
     <% if @query.available_display_types.size > 1 %>
       <p><label for='display_type'><%= l(:label_display_type) %></label>
         <%= available_display_types_tags(@query) %>
@@ -38,7 +44,9 @@
 
     <p id ="default_columns"><label for="query_default_columns"><%=l(:label_default_columns)%></label>
     <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
-          :data => {:disables => "#columns, .block_columns input"} %></p>
+          :data => {:disables => "#columns select, #columns input, .block_columns input"} %></p>
+
+    <p id="columns" ><label for='columns'><%= l(:field_column_names) %></label><%= render_query_columns_selection(query) %></p>
 
     <% unless params[:gantt] %>
       <p id="group_by"><label for="query_group_by"><%= l(:field_group_by) %></label>
@@ -63,13 +71,9 @@
       <label class="inline"><%= check_box_tag "query[draw_selected_columns]", "1", @query.draw_selected_columns, :data => { :enables => 'span.query-columns select, span.query-columns input'} %> <%= l(:description_selected_columns) %></label>
       </p>
     <% end %>
+    </div>
   </fieldset>
 <% end %>
-</div>
-
-<fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
-<%= render :partial => 'queries/filters', :locals => {:query => query}%>
-</fieldset>
 
 <% if params[:calendar].nil? && params[:gantt].nil? %>
   <fieldset id="sort"><legend><%= l(:label_sort) %></legend>
@@ -90,13 +94,6 @@
   </fieldset>
 <% end %>
 
-<% unless params[:calendar] %>
-  <%= content_tag 'fieldset', :id => 'columns' do %>
-  <legend><%= l(:field_column_names) %></legend>
-  <%= render_query_columns_selection(query) %>
-  <% end %>
-<% end %>
-
 </div>
 
 <%= javascript_tag do %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 960ceaefd..b1cedcfd0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -408,6 +408,16 @@ div.table-list.boards .table-list-cell.name {width: 30%;}
   min-width:150px;
 }
 
+.tabular #columns label[for='columns'] {
+  margin-top: 100px;
+}
+.tabular #columns .query-columns label {
+  float: initial;
+  margin-left: 0px;
+  text-align: left;
+  width: initial;
+}
+
 .query-totals {text-align:right; margin-top:-2.3em;}
 .query-totals>span:not(:first-child) {margin-left:0.6em;}
 .query-totals .value {font-weight:bold;}