diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index 2c286e4ba..cb63f84cc 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -98,6 +98,7 @@
-
{{search-box searchTerm=(mut searchTerm) placeholder="Search clients..."}}
+
+ {{search-box
+ searchTerm=(mut searchTerm)
+ onChange=(action resetPagination)
+ placeholder="Search clients..."}}
+
{{/if}}
{{#list-pagination
diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
index 10a04f422..97e5d1a76 100644
--- a/ui/app/templates/jobs/index.hbs
+++ b/ui/app/templates/jobs/index.hbs
@@ -5,7 +5,11 @@
{{#if filteredJobs.length}}
- {{search-box data-test-jobs-search searchTerm=(mut searchTerm) placeholder="Search jobs..."}}
+ {{search-box
+ data-test-jobs-search
+ searchTerm=(mut searchTerm)
+ onChange=(action resetPagination)
+ placeholder="Search jobs..."}}
{{/if}}
diff --git a/ui/app/templates/jobs/job/allocations.hbs b/ui/app/templates/jobs/job/allocations.hbs
index e8f4c07d3..acd57bc9a 100644
--- a/ui/app/templates/jobs/job/allocations.hbs
+++ b/ui/app/templates/jobs/job/allocations.hbs
@@ -6,6 +6,7 @@
{{search-box
data-test-allocations-search
searchTerm=(mut searchTerm)
+ onChange=(action resetPagination)
placeholder="Search allocations..."}}
diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
index b9ead72d8..1b511adb8 100644
--- a/ui/app/templates/jobs/job/task-group.hbs
+++ b/ui/app/templates/jobs/job/task-group.hbs
@@ -46,6 +46,7 @@
{{search-box
searchTerm=(mut searchTerm)
placeholder="Search allocations..."
+ onChange=(action resetPagination)
class="is-inline pull-right"
inputClass="is-compact"}}