diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index e2af15f101..4ce7e5701f 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -226,6 +226,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 			.should('have.length', 1)
 			.click();
 		credentialsModal.getters.saveButton().click();
+		credentialsModal.getters.saveButton().should('have.text', 'Saved');
 		credentialsModal.actions.close();
 
 		projects.getProjectTabWorkflows().click();
@@ -252,6 +253,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		credentialsModal.getters.usersSelect().click();
 		getVisibleSelect().find('li').should('have.length', 4).first().click();
 		credentialsModal.getters.saveButton().click();
+		credentialsModal.getters.saveButton().should('have.text', 'Saved');
 		credentialsModal.actions.close();
 
 		credentialsPage.getters
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index 4e3bb583df..5ea9b99e27 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -15,7 +15,12 @@ import {
 	NDV,
 	MainSidebar,
 } from '../pages';
-import { getVisibleDropdown, getVisibleModalOverlay, getVisibleSelect } from '../utils';
+import {
+	getVisibleDropdown,
+	getVisibleModalOverlay,
+	getVisibleSelect,
+	getVisiblePopper,
+} from '../utils';
 
 const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
@@ -579,6 +584,9 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
 			credentialsPage.getters.credentialMoveButton().click();
 
+			// wait for all poppers to be gone
+			getVisiblePopper().should('have.length', 0);
+
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
@@ -602,6 +610,9 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
 			credentialsPage.getters.credentialMoveButton().click();
 
+			// wait for all poppers to be gone
+			getVisiblePopper().should('have.length', 0);
+
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
@@ -624,6 +635,9 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
 			credentialsPage.getters.credentialMoveButton().click();
 
+			// wait for all poppers to be gone
+			getVisiblePopper().should('have.length', 0);
+
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
@@ -637,6 +651,9 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.click();
 			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
 
+			// wait for all poppers to be gone
+			getVisiblePopper().should('have.length', 0);
+
 			credentialsPage.getters
 				.credentialCards()
 				.should('have.length', 3)