diff --git a/app/views/time_entry_reports/report.html.erb b/app/views/time_entry_reports/report.html.erb
index feb31e82c..0af89a1de 100644
--- a/app/views/time_entry_reports/report.html.erb
+++ b/app/views/time_entry_reports/report.html.erb
@@ -32,6 +32,7 @@
 </div>
 
 <% unless @hours.empty? %>
+<div class="autoscroll">
 <table class="list" id="time-report">
 <thead>
 <tr>
@@ -59,6 +60,7 @@
   </tr>
 </tbody>
 </table>
+</div>
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'CSV', :url => params %>
diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb
index f0454bf9a..4e86d7833 100644
--- a/app/views/timelog/_list.html.erb
+++ b/app/views/timelog/_list.html.erb
@@ -1,5 +1,6 @@
 <% form_tag({}) do -%>
 <%= hidden_field_tag 'back_url', url_for(params) %>
+<div class="autoscroll">
 <table class="list time-entries">
 <thead>
 <tr>
@@ -48,6 +49,7 @@
 <% end -%>
 </tbody>
 </table>
+</div>
 <% end -%>
 
 <%= context_menu time_entries_context_menu_path %>