diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index a8315b735..7259c1d4a 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -72,11 +72,7 @@ Cypress.Commands.overwrite('visit', (originalFn, url, options, waitRequest = tru
 });
 
 Cypress.Commands.add('waitForElement', (element) => {
-    cy.get(element)
-        .should('exist')
-        .scrollIntoView()
-        .should('be.visible')
-        .and('not.be.disabled');
+    cy.get(element).should('be.visible').and('not.be.disabled');
 });
 
 Cypress.Commands.add('getValue', (selector) => {
@@ -114,6 +110,7 @@ Cypress.Commands.add('waitSpinner', () => {
 
 // Fill Inputs
 Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
+    cy.get(selector).should('exist').scrollIntoView();
     cy.waitForElement(selector, timeout);
 
     cy.get(selector, { timeout })