diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 0e4f940b2..4c0528b79 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -10,8 +10,9 @@
 
 <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
             :method => :get, :id => 'query_form') do %>
+  <div id="query_form_with_buttons" class="hide-when-print">
     <%= hidden_field_tag 'set_filter', '1' %>
-    <div id="query_form_content" class="hide-when-print">
+    <div id="query_form_content">
     <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
       <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
       <div style="<%= @query.new_record? ? "" : "display: none;" %>">
@@ -42,8 +43,7 @@
       </div>
     </fieldset>
     </div>
-    <p class="buttons hide-when-print">
-
+    <p class="buttons">
     <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
     <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
     <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
@@ -52,6 +52,7 @@
                              :class => 'icon icon-save' %>
     <% end %>
     </p>
+  </div>
 <% end %>
 
 <%= error_messages_for 'query' %>
diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
index a889f160c..2b3dbf268 100644
--- a/app/views/timelog/_date_range.html.erb
+++ b/app/views/timelog/_date_range.html.erb
@@ -1,4 +1,5 @@
-<div id="query_form_content" class="hide-when-print">
+<div id="query_form_with_buttons" class="hide-when-print">
+<div id="query_form_content">
   <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
     <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
     <div style="<%= @query.new_record? ? "" : "display: none;" %>">
@@ -18,12 +19,13 @@
   </fieldset>
 </div>
 
-<p class="buttons hide-when-print">
+<p class="buttons">
   <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
   <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload'  %>
 </p>
+</div>
 
-<div class="tabs">
+<div class="tabs hide-when-print">
 <% query_params = params.slice(:f, :op, :v, :sort) %>
 <ul>
     <li><%= link_to(l(:label_details), query_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),