diff --git a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
index fd96cc2c1..68ff998cc 100644
--- a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
+++ b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
@@ -180,7 +180,7 @@ test.describe("agent readiness gate screenshots", () => {
     await selectProvider(page, "Anthropic");
     await setCustomModel(page, "claude-opus-4-5");
 
-    await expect(page.getByLabel("API Key")).toBeVisible();
+    await expect(page.getByLabel("API Key", { exact: true })).toBeVisible();
     await expect(page.getByTestId("persona-dialog-submit")).toBeDisabled({
       timeout: 10_000,
     });
@@ -218,7 +218,9 @@ test.describe("agent readiness gate screenshots", () => {
     await openCreateDialog(page);
     await selectProvider(page, "Anthropic");
     await setCustomModel(page, "claude-opus-4-5");
-    await page.getByLabel("API Key").fill("sk-test-api-key-for-e2e");
+    await page
+      .getByLabel("API Key", { exact: true })
+      .fill("sk-test-api-key-for-e2e");
 
     await expect(page.getByTestId("persona-dialog-submit")).toBeEnabled({
       timeout: 5_000,
diff --git a/desktop/tests/e2e/edit-agent.spec.ts b/desktop/tests/e2e/edit-agent.spec.ts
index c77278155..13deed31b 100644
--- a/desktop/tests/e2e/edit-agent.spec.ts
+++ b/desktop/tests/e2e/edit-agent.spec.ts
@@ -134,7 +134,9 @@ test.describe("edit agent dialog", () => {
     await pickDropdownOption(page, "edit-agent-model", "Custom model...");
     await page.locator("#edit-agent-custom-model").fill("claude-opus-4-5");
     // Anthropic requires a credential before save unlocks.
-    await page.getByLabel("API Key").fill("sk-test-edit-agent-e2e");
+    await page
+      .getByLabel("API Key", { exact: true })
+      .fill("sk-test-edit-agent-e2e");
 
     const submit = page.getByTestId("edit-agent-dialog-submit");
     await expect(submit).toBeEnabled({ timeout: 10_000 });
diff --git a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
index 127829aa6..75153bdf0 100644
--- a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
+++ b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
@@ -212,7 +212,7 @@ test.describe("global agent config screenshots", () => {
     await openCreateDialog(page);
     await customizeAgentAi(page);
 
-    await expect(page.getByLabel("API Key")).toBeVisible({
+    await expect(page.getByLabel("API Key", { exact: true })).toBeVisible({
       timeout: 10_000,
     });
     await expect(
@@ -233,7 +233,7 @@ test.describe("global agent config screenshots", () => {
     await openCreateDialog(page);
     await customizeAgentAi(page);
 
-    await expect(page.getByLabel("API Key")).toHaveAttribute(
+    await expect(page.getByLabel("API Key", { exact: true })).toHaveAttribute(
       "placeholder",
       "Inherited from global config",
     );
diff --git a/desktop/tests/e2e/persona-env-vars.spec.ts b/desktop/tests/e2e/persona-env-vars.spec.ts
index 23039ee80..f2da25644 100644
--- a/desktop/tests/e2e/persona-env-vars.spec.ts
+++ b/desktop/tests/e2e/persona-env-vars.spec.ts
@@ -329,7 +329,7 @@ test("persona model options follow the selected LLM provider", async ({
 
   await selectDropdownOption(page, llmProvider, "OpenAI");
   const dialog = page.getByRole("dialog");
-  await expect(dialog.getByLabel("API Key")).toBeVisible();
+  await expect(dialog.getByLabel("API Key", { exact: true })).toBeVisible();
   await expect(
     dialog.getByRole("button", { name: "Advanced", exact: true }),
   ).toHaveAttribute("aria-expanded", "false");
@@ -342,17 +342,17 @@ test("persona model options follow the selected LLM provider", async ({
     .click();
 
   await selectDropdownOption(page, llmProvider, "Anthropic");
-  await expect(dialog.getByLabel("API Key")).toBeVisible();
+  await expect(dialog.getByLabel("API Key", { exact: true })).toBeVisible();
   await expect(model).toBeVisible();
 
   await selectDropdownOption(page, llmProvider, "Gemini");
-  await expect(dialog.getByLabel("API Key")).toBeVisible();
+  await expect(dialog.getByLabel("API Key", { exact: true })).toBeVisible();
   await expect(model).toBeVisible();
 
   // Switch back to inherited defaults — per-agent provider, credential, and
   // model controls disappear together.
   await page.getByRole("tab", { name: "Use agent defaults" }).click();
   await expect(llmProvider).not.toBeVisible();
-  await expect(dialog.getByLabel("API Key")).not.toBeVisible();
+  await expect(dialog.getByLabel("API Key", { exact: true })).not.toBeVisible();
   await expect(model).not.toBeVisible();
 });
diff --git a/desktop/tests/e2e/smoke.spec.ts b/desktop/tests/e2e/smoke.spec.ts
index ebcc45fcf..0d73e789f 100644
--- a/desktop/tests/e2e/smoke.spec.ts
+++ b/desktop/tests/e2e/smoke.spec.ts
@@ -236,7 +236,9 @@ test("create agent supports parallelism and system prompt overrides", async ({
     .getByRole("button", { name: "Custom model...", exact: true })
     .click();
   await page.getByLabel("Custom model ID").fill("claude-opus-4-5");
-  await page.getByLabel("API Key").fill("sk-test-api-key-for-e2e");
+  await page
+    .getByLabel("API Key", { exact: true })
+    .fill("sk-test-api-key-for-e2e");
 
   const advancedToggle = page.getByRole("button", {
     name: "Advanced",
diff --git a/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts b/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts
index f6a18b146..dfb281d57 100644
--- a/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts
+++ b/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts
@@ -153,7 +153,9 @@ test.describe("welcome and channel agent entry points", () => {
       .getByRole("button", { name: "Custom model...", exact: true })
       .click();
     await page.getByLabel("Custom model ID").fill("claude-opus-4-5");
-    await page.getByLabel("API Key").fill("sk-test-api-key-for-e2e");
+    await page
+      .getByLabel("API Key", { exact: true })
+      .fill("sk-test-api-key-for-e2e");
     await expect(page.getByTestId("persona-dialog-submit")).toBeEnabled();
     await page.getByTestId("persona-dialog-submit").click();