diff --git a/playwright.config.ts b/playwright.config.ts
index a1781ff3bb..88159f99e6 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -8,7 +8,7 @@ const BASE_URL = process.env.GITEA_URL?.replace?.(/\/$/g, '') || 'http://localho
  */
 export default {
   testDir: './tests/e2e/',
-  testMatch: /.*\.test\.e2e\.ts/, // Match any .test.e2e.js files
+  testMatch: /.*\.test\.e2e\.ts/, // Match any .test.e2e.ts files
 
   // you can adjust this value locally to match your machine's power,
   // or pass `--workers x` to playwright
diff --git a/tests/e2e/org-members.test.e2e.ts b/tests/e2e/org-members.test.e2e.ts
index c8833991bb..6b2af0aea7 100644
--- a/tests/e2e/org-members.test.e2e.ts
+++ b/tests/e2e/org-members.test.e2e.ts
@@ -19,18 +19,20 @@ test('Toggle visibility', async ({page}) => {
   // Button "Make visible" for user2's row
   const showUser2 = page.locator('.link-action[data-url="/org/org3/members/action/public?uid=2"]');
 
-  await expect(hideUser2).toBeVisible();
-  await expect(showUser2).toBeHidden();
-  await hideUser2.click();
+  if (await hideUser2.isHidden()) {
+    // Bring page to a consistent state before testing
+    await showUser2.click();
+    await expect(hideUser2).toBeVisible();
+    await expect(showUser2).toBeHidden();
+  }
 
-  // Button action was flipped
+  // Click button to make user2 hidden
+  await hideUser2.click();
+  await page.waitForLoadState();
+
+  // Verify that button action was flipped
   await expect(hideUser2).toBeHidden();
   await expect(showUser2).toBeVisible();
-
-  // Revert for repeatability
-  await showUser2.click();
-  await expect(hideUser2).toBeVisible();
-  await expect(showUser2).toBeHidden();
 });
 
 test('Leave org', async ({page}) => {