diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-enum.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-enum.cy.js
index cbf52e55f4..de946b4768 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-enum.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-enum.cy.js
@@ -53,6 +53,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(itemFieldValues.itemStatus);
         QueryModal.verifySelectedField(itemFieldValues.itemStatus);
         QueryModal.verifyQueryAreaContent('(items.status_name  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-in-not-in-operators.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-in-not-in-operators.cy.js
index d08d55db9a..ab1292f168 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-in-not-in-operators.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-in-not-in-operators.cy.js
@@ -63,6 +63,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(itemFieldValues.itemUuid);
         QueryModal.verifySelectedField(itemFieldValues.itemUuid);
         QueryModal.verifyQueryAreaContent('(items.id  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-items-edit-render-preview.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-items-edit-render-preview.cy.js
index e18cd00da0..2a01af924a 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-items-edit-render-preview.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-items-edit-render-preview.cy.js
@@ -56,6 +56,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(itemFieldValues.temporaryLocation);
         QueryModal.verifySelectedField(itemFieldValues.temporaryLocation);
         QueryModal.verifyQueryAreaContent('(temporary_location.name  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-items-view-render-preview.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-items-view-render-preview.cy.js
index b69457e5bf..bb2e985de8 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-items-view-render-preview.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-items-view-render-preview.cy.js
@@ -77,6 +77,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(itemFieldValues.itemStatus);
         QueryModal.verifySelectedField(itemFieldValues.itemStatus);
         QueryModal.verifyQueryAreaContent('(items.status_name  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-search-date-time-string.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-search-date-time-string.cy.js
index f315566dbf..ccbba0c9e0 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-search-date-time-string.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-search-date-time-string.cy.js
@@ -49,6 +49,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(usersFieldValues.expirationDate);
         QueryModal.verifySelectedField(usersFieldValues.expirationDate);
         QueryModal.verifyQueryAreaContent('(users.expiration_date  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-boolean.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-boolean.cy.js
index c60d556bea..2dd51d4a61 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-boolean.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-boolean.cy.js
@@ -52,6 +52,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(usersFieldValues.preferredContactType);
         QueryModal.verifySelectedField(usersFieldValues.preferredContactType);
         QueryModal.verifyQueryAreaContent('(users.preferred_contact_type  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-but-million.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-but-million.cy.js
index 914c537997..3e59f19068 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-but-million.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-search-string-stores-uuid-but-million.cy.js
@@ -61,6 +61,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(itemFieldValues.instanceId);
         QueryModal.verifySelectedField(itemFieldValues.instanceId);
         QueryModal.verifyQueryAreaContent('(instances.id  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-users-edit-render-preview.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-users-edit-render-preview.cy.js
index 42cc76ed49..757fa9048b 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-users-edit-render-preview.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-users-edit-render-preview.cy.js
@@ -50,6 +50,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(usersFieldValues.patronGroup);
         QueryModal.verifySelectedField(usersFieldValues.patronGroup);
         QueryModal.verifyQueryAreaContent('(groups.group  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-holdings.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-holdings.cy.js
index 2c1d6119fe..9b1869cebb 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-holdings.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-holdings.cy.js
@@ -42,6 +42,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(holdingsFieldValues.instanceUuid);
         QueryModal.verifySelectedField(holdingsFieldValues.instanceUuid);
         QueryModal.verifyQueryAreaContent('(holdings.instance_id  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-instances.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-instances.cy.js
index 57420b7800..5ea18b55ff 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-instances.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-instances.cy.js
@@ -42,6 +42,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(instanceFieldValues.instanceHrid);
         QueryModal.verifySelectedField(instanceFieldValues.instanceHrid);
         QueryModal.verifyQueryAreaContent('(instance.hrid  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-items.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-items.cy.js
index 1f046dd480..71fdd0bb3e 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-items.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-items.cy.js
@@ -42,6 +42,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(itemFieldValues.holdingsId);
         QueryModal.verifySelectedField(itemFieldValues.holdingsId);
         QueryModal.verifyQueryAreaContent('(holdings.id  )');
diff --git a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-users.cy.js b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-users.cy.js
index 3fbe5f50da..ab25087865 100644
--- a/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-users.cy.js
+++ b/cypress/e2e/bulk-edit/query/bulk-edit-query-zero-users.cy.js
@@ -42,6 +42,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.clickBuildQueryButton();
         QueryModal.verify();
         QueryModal.verifyFieldsSortedAlphabetically();
+        QueryModal.clickSelectFieldButton();
         QueryModal.selectField(usersFieldValues.userBarcode);
         QueryModal.verifySelectedField(usersFieldValues.userBarcode);
         QueryModal.verifyQueryAreaContent('(users.barcode  )');
diff --git a/cypress/support/fragments/bulk-edit/query-modal.js b/cypress/support/fragments/bulk-edit/query-modal.js
index 6eb6b5b2b5..6fc08e22bc 100644
--- a/cypress/support/fragments/bulk-edit/query-modal.js
+++ b/cypress/support/fragments/bulk-edit/query-modal.js
@@ -157,10 +157,13 @@ export default {
   },
 
   selectField(selection, row = 0) {
-    cy.do(selectFieldButton.click());
     cy.do(RepeatableFieldItem({ index: row }).find(Selection()).choose(selection));
   },
 
+  clickSelectFieldButton() {
+    cy.do(selectFieldButton.click());
+  },
+
   typeInAndSelectField(string, row = 0) {
     cy.wait(1000);
     cy.do([