diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index f420befe..354a4842 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -158,17 +158,24 @@
 <div class="grid_2 prefix_1 omega">
   <span class="button gray small">
     {% if workouts.has_previous %}
+    {% if request.GET.q %}
+    <a class="wh" href="?page={{ workouts.previous_page_number }}&q={{ request.GET.q }}">&lt;</a>
+    {% else %}
     <a class="wh" href="?page={{ workouts.previous_page_number }}">&lt;</a>
     {% endif %}
+    {% endif %}
     
     <span>
       Page {{ workouts.number }} of {{ workouts.paginator.num_pages }}.
     </span>
     
     {% if workouts.has_next %}
+    {% if request.GET.q %}
+    <a class="wh" href="?page={{ workouts.next_page_number }}&q={{ request.GET.q }}">&gt;</a>
+    {% else %}
     <a class="wh" href="?page={{ workouts.next_page_number }}">&gt;</a>
     {% endif %}
+    {% endif %}
   </span>
 
-
 {% endblock %}