diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index b5c414ba10446d43ad86f055995abfe1f7875f2f..fdd663d2ac66f10d7b7355e2391038d6db60f386 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -186,6 +186,14 @@
             <input type="hidden" name="id" value="[% buglist_joined FILTER html %]">
             <input type="submit" id="timesummary" value="Time Summary">
           </form>
+          [% IF time_summary_limited %]
+            <small>
+              Time Summary will only include the bugs shown above. In order to
+              to see a time summary for all bugs found by the search, you can 
+              <a href="buglist.cgi?[% urlquerypart FILTER html %]
+                       [%- "&order=$qorder" FILTER html IF order %]&limit=0">
+                Show all search results</a>.</small>
+          [% END %]
         [% END %]
       </td>
       
@@ -295,6 +303,7 @@
       <a href="buglist.cgi?[% urlquerypart FILTER html %]
               [%- "&order=$qorder" FILTER html IF order %]&limit=0">See
         all search results for this query</a>.
+      [% time_summary_limited = 1 %]
     [% ELSIF bugs.size == 1 %]
       One [% terms.bug %] found.
     [% ELSE %]