diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
index 54dd8b512..86ffb8fa9 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
@@ -55,42 +55,39 @@ test(
       timeout: 3000,
     });
 
+    // Wait for the modal inputs to be visible
+    await page.waitForSelector(
+      '[data-testid="popover-anchor-input-base_url-edit"]',
+      {
+        timeout: 5000,
+        state: "visible",
+      },
+    );
+
+    // Fill the first input (base_url field)
     await page
-      .getByPlaceholder("Type something...")
-      .first()
+      .getByTestId("popover-anchor-input-base_url-edit")
       .fill("ollama_test_ctrl_a_first_input");
     let value = await page
-      .getByPlaceholder("Type something...")
-      .first()
+      .getByTestId("popover-anchor-input-base_url-edit")
       .inputValue();
     expect(value).toBe("ollama_test_ctrl_a_first_input");
 
-    await page
-      .getByPlaceholder("Type something...")
-      .last()
-      .fill("ollama_test_ctrl_a_second_input");
-    let secondValue = await page
-      .getByPlaceholder("Type something...")
-      .last()
-      .inputValue();
-    expect(secondValue).toBe("ollama_test_ctrl_a_second_input");
-
-    await page.getByPlaceholder("Type something...").last().click();
-
     await page.keyboard.press("ControlOrMeta+a");
 
     await page.keyboard.press("ControlOrMeta+c");
 
-    await page.getByPlaceholder("Type something...").first().click();
-
-    await page.keyboard.press("ControlOrMeta+a");
+    await page.keyboard.press("Backspace");
+    value = await page
+      .getByTestId("popover-anchor-input-base_url-edit")
+      .inputValue();
+    expect(value).toBe("");
 
     await page.keyboard.press("ControlOrMeta+v");
 
     value = await page
-      .getByPlaceholder("Type something...")
-      .first()
+      .getByTestId("popover-anchor-input-base_url-edit")
       .inputValue();
-    expect(value).toBe("ollama_test_ctrl_a_second_input");
+    expect(value).toBe("ollama_test_ctrl_a_first_input");
   },
 );