diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 458d7139e..ec9d4fef6 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -59,19 +59,19 @@ function toggle_multi_select(field) {
 <table width="100%">
 <tr>
 <td>
-<table style="padding:0;">
+<table>
 <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
     <% field = filter[0]
        options = filter[1] %>
-    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
-    <td valign="top" style="width:200px;">
+    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
+    <td style="width:200px;">
         <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
         <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
     </td>
-    <td valign="top" style="width:150px;">
+    <td style="width:150px;">
         <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
     </td>
-    <td valign="top">    
+    <td>    
     <div id="div_values_<%= field %>" style="display:none;">
     <% case options[:type]
     when :list, :list_optional, :list_status, :list_subprojects %>
@@ -93,7 +93,7 @@ function toggle_multi_select(field) {
 <% end %>
 </table>
 </td>
-<td align="right" valign="top">
+<td class="add-filter">
 <%= l(:label_filter_add) %>:
 <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
 </td>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 682e95dde..7b73d0939 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -160,8 +160,12 @@ p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
 p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } 
 
 fieldset#filters { padding: 0.7em; }
-fieldset#filters p { margin: 0.8em 0 0.8em 0; }
-fieldset#filters .buttons { text-align: right; font-size: 0.9em; }
+fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
+fieldset#filters .buttons { font-size: 0.9em; }
+fieldset#filters table { border-collapse: collapse; }
+fieldset#filters table td { padding: 0; vertical-align: middle; }
+fieldset#filters tr.filter { height: 2em; }
+fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
 div#issue-changesets .changeset { padding: 4px;}