diff --git a/src/frontend/src/modals/editNodeModal/index.tsx b/src/frontend/src/modals/editNodeModal/index.tsx
index 17dcaaf0b..a9d85bff2 100644
--- a/src/frontend/src/modals/editNodeModal/index.tsx
+++ b/src/frontend/src/modals/editNodeModal/index.tsx
@@ -36,7 +36,9 @@ const EditNodeModal = ({
         <></>
       </BaseModal.Trigger>
       <BaseModal.Header description={data.node?.description!}>
-        <span className="pr-2">{data.node?.display_name ?? data.type}</span>
+        <span data-testid="node-modal-title" className="pr-2">
+          {data.node?.display_name ?? data.type}
+        </span>
         <div>
           <Badge size="sm" variant={isDark ? "gray" : "secondary"}>
             ID: {data.id}
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 25176a7bc..2d43b44bc 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
@@ -21,7 +21,9 @@ test(
 
     while (modalCount === 0) {
       await page.getByText("New Flow", { exact: true }).click();
-      await page.waitForTimeout(3000);
+      await page.waitForSelector('[data-testid="modal-title"]', {
+        timeout: 3000,
+      });
       modalCount = await page.getByTestId("modal-title")?.count();
     }
 
@@ -33,7 +35,9 @@ test(
 
     await page.getByTestId("sidebar-search-input").click();
     await page.getByTestId("sidebar-search-input").fill("ollama");
-    await page.waitForTimeout(1000);
+    await page.waitForSelector('[data-testid="embeddingsOllama Embeddings"]', {
+      timeout: 3000,
+    });
 
     await page
       .getByTestId("embeddingsOllama Embeddings")
@@ -50,7 +54,9 @@ test(
 
     await page.keyboard.press(`ControlOrMeta+Shift+A`);
 
-    await page.waitForTimeout(1000);
+    await page.waitForSelector('[data-testid="node-modal-title"]', {
+      timeout: 3000,
+    });
 
     await page
       .getByPlaceholder("Type something...")
@@ -73,24 +79,15 @@ test(
     expect(secondValue).toBe("ollama_test_ctrl_a_second_input");
 
     await page.getByPlaceholder("Type something...").last().click();
-    await page.waitForTimeout(1000);
 
     await page.keyboard.press("ControlOrMeta+a");
 
-    await page.waitForTimeout(1000);
-
     await page.keyboard.press("ControlOrMeta+c");
 
-    await page.waitForTimeout(1000);
-
     await page.getByPlaceholder("Type something...").nth(2).click();
 
-    await page.waitForTimeout(1000);
-
     await page.keyboard.press("ControlOrMeta+a");
 
-    await page.waitForTimeout(1000);
-
     await page.keyboard.press("ControlOrMeta+v");
 
     value = await page