diff --git a/packages/e2e-tests/fixtures/admin/users-page.js b/packages/e2e-tests/fixtures/admin/users-page.js
index 9b707669..301ad47d 100644
--- a/packages/e2e-tests/fixtures/admin/users-page.js
+++ b/packages/e2e-tests/fixtures/admin/users-page.js
@@ -24,6 +24,16 @@ export class AdminUsersPage extends AuthenticatedPage {
   }
 
   async navigateTo() {
+    await this.profileMenuButton.click();
+    await Promise.all([this.adminMenuItem.click(), this.isMounted()]);
+    if (await this.usersLoader.isVisible()) {
+      await this.usersLoader.waitFor({
+        state: 'detached',
+      });
+    }
+  }
+
+  async navigateToAndWaitForUsers() {
     await this.profileMenuButton.click();
     await Promise.all([
       this.page.waitForResponse(
diff --git a/packages/e2e-tests/tests/admin/manage-roles.spec.js b/packages/e2e-tests/tests/admin/manage-roles.spec.js
index 2419ee84..194fb110 100644
--- a/packages/e2e-tests/tests/admin/manage-roles.spec.js
+++ b/packages/e2e-tests/tests/admin/manage-roles.spec.js
@@ -195,7 +195,7 @@ test.describe('Role management page', () => {
     });
 
     await test.step('Change the role the user has', async () => {
-      await adminUsersPage.navigateTo();
+      await adminUsersPage.navigateToAndWaitForUsers();
       await adminUsersPage.usersLoader.waitFor({
         state: 'detached',
       });
@@ -264,7 +264,7 @@ test.describe('Role management page', () => {
     });
 
     await test.step('Delete this user', async () => {
-      await adminUsersPage.navigateTo();
+      await adminUsersPage.navigateToAndWaitForUsers();
       const row = await adminUsersPage.findUserPageWithEmail(
         'user-delete-role-test@automatisch.io'
       );
diff --git a/packages/e2e-tests/tests/admin/manage-users.spec.js b/packages/e2e-tests/tests/admin/manage-users.spec.js
index 2887412c..274852d4 100644
--- a/packages/e2e-tests/tests/admin/manage-users.spec.js
+++ b/packages/e2e-tests/tests/admin/manage-users.spec.js
@@ -100,7 +100,7 @@ test.describe('User management page', () => {
     });
 
     await test.step('Delete the created user', async () => {
-      await adminUsersPage.navigateTo();
+      await adminUsersPage.navigateToAndWaitForUsers();
       await adminUsersPage.findUserPageWithEmail(testUser.email);
       const userRow = await adminUsersPage.getUserRowByEmail(testUser.email);
       await adminUsersPage.clickDeleteUser(userRow);
@@ -198,7 +198,7 @@ test.describe('User management page', () => {
     });
 
     await test.step('Try editing the second user to have the email of the first user', async () => {
-      await adminUsersPage.navigateTo();
+      await adminUsersPage.navigateToAndWaitForUsers();
       await adminUsersPage.findUserPageWithEmail(user2.email);
       let userRow = await adminUsersPage.getUserRowByEmail(user2.email);
       await adminUsersPage.clickEditUser(userRow);