diff --git a/warehouse/templates/item/list.html b/warehouse/templates/item/list.html
index 985e5037035ad1ef9df8144d7f73d57af1d13cc7..6c14261306bab17c85f7578e3c9ad8c93cf4bc90 100644
--- a/warehouse/templates/item/list.html
+++ b/warehouse/templates/item/list.html
@@ -42,7 +42,7 @@
 	<nav aria-label="...">
 		<ul class="pagination">
 			{% if page.has_prev %}
-				<li class="page-item"><a class="page-link" href="?page={{ page.prev_num }}">Previous</a></li>
+				<li class="page-item"><a class="page-link" href="{{ url_for('item_list', search=request.args.get('search'), page=page.prev_num) }}">Previous</a></li>
 			{% else %}
 				<li class="page-item disabled"><span class="page-link">Previous</span></li>
 			{% endif %}
@@ -51,14 +51,14 @@
 				{% if not item %}
 					<li class="page-item disabled"><span class="page-link">...</span></li>
 				{% elif item != page.page %}
-					<li class="page-item"><a class="page-link" href="?page={{ item }}">{{ item }}</a></li>
+					<li class="page-item"><a class="page-link" href="{{ url_for('item_list', search=request.args.get('search'), page=item) }}">{{ item }}</a></li>
 				{% else %}
 					<li class="page-item active" aria-current="page"><span class="page-link">{{ item }}</span></li>
 				{% endif %}
 			{% endfor %}
 
 			{% if page.has_next %}
-			<li class="page-item"><a class="page-link" href="?page={{ page.next_num }}">Next</a></li>
+			<li class="page-item"><a class="page-link" href="{{ url_for('item_list', search=request.args.get('search'), page=page.next_num) }}">Next</a></li>
 			{% else %}
 			<li class="page-item disabled"><span class="page-link">Next</span></li>
 			{% endif %}