diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index d91f07535..afdc6efca 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -62,6 +62,7 @@ defineExpose({
                     @click="emit('onDataCanceled')"
                     v-close-popup
                     data-cy="FormModelPopup_cancel"
+                    z-max
                 />
                 <QBtn
                     :label="t('globals.save')"
@@ -72,6 +73,7 @@ defineExpose({
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_save"
+                    z-max
                 />
             </div>
         </template>
diff --git a/test/cypress/integration/client/clientBasicData.spec.js b/test/cypress/integration/client/clientBasicData.spec.js
index efaad33c2..bed28dc22 100644
--- a/test/cypress/integration/client/clientBasicData.spec.js
+++ b/test/cypress/integration/client/clientBasicData.spec.js
@@ -7,8 +7,8 @@ describe('Client basic data', () => {
     });
     it('Should load layout', () => {
         cy.get('.q-card').should('be.visible');
-        cy.dataCy('customerPhone').filter('input').should('be.visible');
-        cy.dataCy('customerPhone').filter('input').type('123456789');
+        cy.dataCy('customerPhone').find('input').should('be.visible');
+        cy.dataCy('customerPhone').find('input').type('123456789');
         cy.get('.q-btn-group > .q-btn--standard').click();
         cy.intercept('PATCH', '/api/Clients/1102', (req) => {
             const { body } = req;
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index e89b5fc77..ce07deb16 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -22,10 +22,10 @@ describe('Client list', () => {
         const data = {
             Name: { val: `Name ${randomInt}` },
             'Social name': { val: `TEST ${randomInt}` },
-            'Tax number': { val: `20852${randomInt.length}3Z` },
+            'Tax number': { val: `20852${randomInt}3Z` },
             'Web user': { val: `user_test_${randomInt}` },
             Street: { val: `C/ STREET ${randomInt}` },
-            Email: { val: 'user.test@1.com' },
+            Email: { val: `user.test${randomInt}@cypress.com` },
             'Sales person': { val: 'employee', type: 'select' },
             Location: { val: '46000, Valencia(Province one), España', type: 'select' },
             'Business type': { val: 'Otros', type: 'select' },
@@ -34,7 +34,7 @@ describe('Client list', () => {
 
         cy.get('.q-mt-lg > .q-btn--standard').click();
 
-        cy.checkNotification('Data saved');
+        cy.checkNotification('Data created');
         cy.url().should('include', '/summary');
     });
     it('Client list search client', () => {
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index bbdbcea92..b30b4cdad 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -47,7 +47,8 @@ describe('TicketList', () => {
             Landed: { val: '01-01-2024', type: 'date' },
         };
         cy.fillInForm(data);
-        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.dataCy('Agency_select').click();
+        cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('Data created');
         cy.url().should('match', /\/ticket\/\d+\/summary/);
     });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 21121d9df..64b37239e 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -111,7 +111,9 @@ Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
                 switch (type) {
                     case 'select':
                         cy.wrap(el).type(val);
-                        cy.get('.q-menu .q-item').contains(val).click();
+                        cy.get('.q-menu .q-item', { timeout: 2000 })
+                            .contains(val)
+                            .click();
                         break;
                     case 'date':
                         cy.wrap(el).type(val.split('-').join(''));