diff --git a/web/src/cypress/support/form.ts b/web/src/cypress/support/form.ts
index 546366d24d..993086cfc4 100644
--- a/web/src/cypress/support/form.ts
+++ b/web/src/cypress/support/form.ts
@@ -42,9 +42,11 @@ function fillFormField(
       }
 
       // select dropdowns
-      if (el.attr('role') === 'combobox') {
+      if (el.siblings().attr('aria-haspopup') === 'listbox') {
+        cy.log('log: is a select')
         // action to clear multi-select
         if (value === '') {
+          cy.log('log: clear multi')
           cy.get(selector).clear()
 
           el.parent()
@@ -69,6 +71,7 @@ function fillFormField(
 
         return cy.get(selector).selectByLabel(value)
       }
+      cy.log('log: not a select')
 
       if (Array.isArray(value)) {
         throw new TypeError('arrays only supported for search-select inputs')