diff --git a/app/assets/stylesheets/content/_expandable_group_content.css.sass b/app/assets/stylesheets/content/_expandable_group_content.css.sass
index 7b786f036d..663e06737e 100644
--- a/app/assets/stylesheets/content/_expandable_group_content.css.sass
+++ b/app/assets/stylesheets/content/_expandable_group_content.css.sass
@@ -32,6 +32,8 @@ fieldset
       margin:
         left: -20px
         right: 25px
+    .horizontal_margin
+      margin: 5px 0
 
     p
       margin-bottom: -10px
diff --git a/app/views/work_packages/index.html.erb b/app/views/work_packages/index.html.erb
index 728c81a845..e2c76597ca 100644
--- a/app/views/work_packages/index.html.erb
+++ b/app/views/work_packages/index.html.erb
@@ -76,23 +76,17 @@ See doc/COPYRIGHT.rdoc for more details.
         <fieldset id="column_options" class="header_collapsible collapsible collapsed">
           <legend title="<%=l(:description_option_toggle)%>", onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_options) %></a></legend>
           <div style="display: none;" class="tabular">
-            <p>
-              <div><%= label_tag :available_columns, Query.human_attribute_name(:column_names), class: "header" %></div>
-              <div>
-                <%= render :partial => 'queries/columns', :locals => {:query => query} %>
-              </div>
-            </p>
-            <p>
-              <div><label for='group_by' class='header'><%= Query.human_attribute_name(:group_by) %></label></div>
-              <div>
-                <%= select_tag('group_by', options_for_select([[]] + query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, query.group_by)) %>
-              </div>
-            </p>
+            <div class="horizontal_margin"><%= label_tag :available_columns, Query.human_attribute_name(:column_names), class: "header" %></div>
+            <div class="horizontal_margin">
+              <%= render :partial => 'queries/columns', :locals => {:query => query} %>
+            </div>
+            <div class="horizontal_margin"><label for='group_by' class='header'><%= Query.human_attribute_name(:group_by) %></label></div>
+            <div class="horizontal_margin">
+              <%= select_tag('group_by', options_for_select([[]] + query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, query.group_by)) %>
+            </div>
             <% if query.any_summable_columns? %>
-              <p>
-                <div><%= label_tag :display_sums, Query.human_attribute_name(:display_sums), class: "header" %></div>
-                <div><%= check_box_tag :display_sums, 1, query.display_sums? %></div>
-              </p>
+                <div class="horizontal_margin"><%= label_tag :display_sums, Query.human_attribute_name(:display_sums), class: "header" %></div>
+                <div class="horizontal_margin"><%= check_box_tag :display_sums, 1, query.display_sums? %></div>
             <% end %>
             <%= call_hook(:view_issue_query_form_options_bottom, :query => query) %>
           </div>