diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index f990c1774..8773c9981 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -183,23 +183,23 @@ Cypress.Commands.add('fillInForm', (obj, opts = {}) => {
             .then((key) => {
                 const field = obj[key];
                 if (!field) return;
-                if (typeof field == 'string')
-                    return cy
-                        .wrap(el)
-                        .type(`{selectall}{backspace}${field}`, { delay: 0 });
 
-                const { type, val } = field;
+                const { type, val } =
+                    typeof field === 'string' ? { type: 'string', val: field } : field;
+
                 switch (type) {
                     case 'select':
-                        cy.selectOption(el, val);
+                        cy.wrap(el)
+                            .closest('.q-select')
+                            .then(($select) => {
+                                cy.selectOption($select, val);
+                            });
                         break;
                     case 'date':
-                        cy.get(el).type(
-                            `{selectall}{backspace}${val}`,
-                        ).blur();
+                        cy.wrap(el).type(`{selectall}{backspace}${val}`).blur();
                         break;
                     case 'time':
-                        cy.get(el).click();
+                        cy.wrap(el).click();
                         cy.get('.q-time .q-time__clock').contains(val.h).click();
                         cy.get('.q-time .q-time__clock').contains(val.m).click();
                         cy.get('.q-time .q-time__link').contains(val.x).click();