diff --git a/tests/e2e/ui/helpers/navigation.ts b/tests/e2e/ui/helpers/navigation.ts
index 78288fab743..90591060ca4 100644
--- a/tests/e2e/ui/helpers/navigation.ts
+++ b/tests/e2e/ui/helpers/navigation.ts
@@ -92,7 +92,7 @@ export async function openKeyDetail(page: PlaywrightPage, alias: string): Promis
   await page.getByPlaceholder("Search by key alias or ID").fill(alias);
   const row = page.getByRole("row").filter({ hasText: alias });
   await expect(row, `key row "${alias}" never appeared on the Virtual Keys page`).toBeVisible({ timeout: 15_000 });
-  await row.getByRole("button", { name: alias }).click();
+  await row.getByText(alias, { exact: true }).click();
   await expect(page.getByText("Back to Keys"), `key detail for "${alias}" never opened`).toBeVisible({
     timeout: 15_000,
   });
diff --git a/tests/e2e/ui/tests/internal-viewer/internalViewer.spec.ts b/tests/e2e/ui/tests/internal-viewer/internalViewer.spec.ts
index dd40976341d..b234014fd95 100644
--- a/tests/e2e/ui/tests/internal-viewer/internalViewer.spec.ts
+++ b/tests/e2e/ui/tests/internal-viewer/internalViewer.spec.ts
@@ -61,7 +61,7 @@ test.describe("Internal Viewer", () => {
     // Open the viewer's own key info page
     const keyRow = page.getByRole("row").filter({ hasText: E2E_VIEWER_KEY_ALIAS });
     await expect(keyRow).toBeVisible({ timeout: 10_000 });
-    await keyRow.getByRole("button", { name: E2E_VIEWER_KEY_ALIAS }).click();
+    await keyRow.getByText(E2E_VIEWER_KEY_ALIAS, { exact: true }).click();
     await expect(page.getByText("Back to Keys")).toBeVisible({ timeout: 10_000 });
 
     // None of the destructive / mutating actions should render
diff --git a/tests/e2e/ui/tests/proxy-admin/keys.spec.ts b/tests/e2e/ui/tests/proxy-admin/keys.spec.ts
index deb7ae70d07..47ff4fd32ff 100644
--- a/tests/e2e/ui/tests/proxy-admin/keys.spec.ts
+++ b/tests/e2e/ui/tests/proxy-admin/keys.spec.ts
@@ -92,7 +92,7 @@ test.describe("Proxy Admin - Keys", () => {
 
     const keyRow = page.getByRole("row").filter({ hasText: E2E_REGENERATE_KEY_ALIAS });
     await expect(keyRow).toBeVisible({ timeout: 10_000 });
-    await keyRow.getByRole("button", { name: E2E_REGENERATE_KEY_ALIAS }).click();
+    await keyRow.getByText(E2E_REGENERATE_KEY_ALIAS, { exact: true }).click();
 
     await expect(page.getByText("Back to Keys")).toBeVisible({ timeout: 10_000 });
 
@@ -126,7 +126,7 @@ test.describe("Proxy Admin - Keys", () => {
 
     const keyRow = page.getByRole("row").filter({ hasText: E2E_UPDATE_LIMITS_KEY_ALIAS });
     await expect(keyRow).toBeVisible({ timeout: 10_000 });
-    await keyRow.getByRole("button", { name: E2E_UPDATE_LIMITS_KEY_ALIAS }).click();
+    await keyRow.getByText(E2E_UPDATE_LIMITS_KEY_ALIAS, { exact: true }).click();
 
     await expect(page.getByText("Back to Keys")).toBeVisible({ timeout: 10_000 });
 
@@ -168,7 +168,7 @@ test.describe("Proxy Admin - Keys", () => {
 
     const keyRow = page.getByRole("row").filter({ hasText: alias });
     await expect(keyRow).toBeVisible({ timeout: 10_000 });
-    await keyRow.getByRole("button", { name: alias }).click();
+    await keyRow.getByText(alias, { exact: true }).click();
 
     await expect(page.getByText("Back to Keys")).toBeVisible({ timeout: 10_000 });