diff --git a/reviewboard/search/views.py b/reviewboard/search/views.py
index fe8bf45f86493f34c3e25a786cdba35550a8adce..2081ebd3b3fc93e73206fcd5202dbf42cdebe975 100644
--- a/reviewboard/search/views.py
+++ b/reviewboard/search/views.py
@@ -130,13 +130,18 @@ class RBSearchView(CheckLoginRequiredViewMixin,
         active_filters = form.cleaned_data.get('model_filter',
                                                [form.FILTER_ALL])
 
-        context.update({
-            'filter_types': OrderedDict(
+        filter_types = OrderedDict(
                 (filter_id, dict(active=(filter_id in active_filters),
                                  **filter_type))
                 for filter_id, filter_type in six.iteritems(form.FILTER_TYPES)
-            ),
-            'hits_returned': len(object_list),
+            )
+
+        context.update({
+            'active_filter': active_filters[0],
+            'extra_url_query': '&model_filter=%s' % active_filters[0],
+            'filter_types': filter_types,
+            'hits_returned': paginator.count,
+            'last_page': paginator.num_pages,
             'page_numbers': page_nums,
             'show_first_page': 1 not in page_nums,
             'show_last_page': paginator.num_pages not in page_nums,
diff --git a/reviewboard/templates/search/results.html b/reviewboard/templates/search/results.html
index 3b20d9e0ab7d0e17dd7dc47de8d58e25e51266e4..0ba1dbb200e41d046958e2a67168404764511d43 100644
--- a/reviewboard/templates/search/results.html
+++ b/reviewboard/templates/search/results.html
@@ -37,25 +37,25 @@
 {%  if is_paginated %}
   <div class="paginator">
 {%   if show_first_page %}
-   <a href="?q={{query}}&amp;page=1">&laquo; {% trans "First Page" %}</a>
+   <a href="?q={{query}}{{extra_url_query}}&amp;page=1">&laquo; {% trans "First Page" %}</a>
 {%   endif %}
 {%   if page_obj.has_previous %}
-   <a href="?q={{query}}&amp;page={{page_obj.previous_page_number}}">&lt; {% trans "Previous" %}</a>
+   <a href="?q={{query}}{{extra_url_query}}&amp;page={{page_obj.previous_page_number}}">&lt; {% trans "Previous" %}</a>
 {%   endif %}
 
 {%   for pagenum in page_numbers %}
 {%    if page_obj.number == pagenum %}
    <strong>{{pagenum}}</strong>
 {%    else %}
-   <a href="?q={{query}}&amp;page={{pagenum}}">{{pagenum}}</a>
+   <a href="?q={{query}}{{extra_url_query}}&amp;page={{pagenum}}">{{pagenum}}</a>
 {%    endif %}
 {%   endfor %}
 
 {%   if page_obj.has_next %}
-   <a href="?q={{query}}&amp;page={{page_obj.next_page_number}}">{% trans "Next" %} &gt;</a>
+   <a href="?q={{query}}{{extra_url_query}}&amp;page={{page_obj.next_page_number}}">{% trans "Next" %} &gt;</a>
 {%   endif %}
 {%   if show_last_page %}
-   <a href="?q={{query}}&amp;page={{pages}}">{% trans "Last Page" %} &raquo;</a>
+   <a href="?q={{query}}{{extra_url_query}}&amp;page={{last_page}}">{% trans "Last Page" %} &raquo;</a>
 {%   endif %}
   </div>
 {%  endif %}