diff --git a/packages/app/e2e-tests/app.test.ts b/packages/app/e2e-tests/app.test.ts
index 6d16d134c7..d93b6eed32 100644
--- a/packages/app/e2e-tests/app.test.ts
+++ b/packages/app/e2e-tests/app.test.ts
@@ -25,7 +25,11 @@ test('App should render the welcome page', async ({ page }) => {
 
   // Verify the sidebar navigation is visible after sign-in
   await expect(
-    page.getByRole('navigation').getByRole('link', { name: 'Catalog' }),
+    page
+      .getByRole('navigation')
+      .getByRole('link', { name: 'Catalog', exact: true }),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('link', { name: 'APIs', exact: true }),
   ).toBeVisible();
-  await expect(page.getByRole('link', { name: 'APIs' })).toBeVisible();
 });
diff --git a/packages/create-app/templates/next-app/packages/app/e2e-tests/app.test.ts b/packages/create-app/templates/next-app/packages/app/e2e-tests/app.test.ts
index 187e124bfa..d8dbc1faa8 100644
--- a/packages/create-app/templates/next-app/packages/app/e2e-tests/app.test.ts
+++ b/packages/create-app/templates/next-app/packages/app/e2e-tests/app.test.ts
@@ -24,6 +24,10 @@ test('App should render the welcome page', async ({ page }) => {
   await enterButton.click();
 
   const nav = page.getByRole('navigation');
-  await expect(nav.getByRole('link', { name: 'Catalog' })).toBeVisible();
-  await expect(page.getByRole('link', { name: 'APIs' })).toBeVisible();
+  await expect(
+    nav.getByRole('link', { name: 'Catalog', exact: true }),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('link', { name: 'APIs', exact: true }),
+  ).toBeVisible();
 });