diff --git a/e2e/note_types/mermaid.spec.ts b/e2e/note_types/mermaid.spec.ts
index f7a0dd401..f64a447d7 100644
--- a/e2e/note_types/mermaid.spec.ts
+++ b/e2e/note_types/mermaid.spec.ts
@@ -63,7 +63,7 @@ async function testAriaSnapshot({ page, context, noteTitle, snapshot }: AriaTest
     await app.goto();
     await app.goToNoteInNewTab(noteTitle);
 
-    const svgData = app.currentNoteSplit.locator(".mermaid-render svg");
+    const svgData = app.currentNoteSplit.locator(".render-container svg");
     await expect(svgData).toBeVisible();
     await expect(svgData).toMatchAriaSnapshot(snapshot);
 }
diff --git a/e2e/support/app.ts b/e2e/support/app.ts
index 55f36a7ff..b526638d9 100644
--- a/e2e/support/app.ts
+++ b/e2e/support/app.ts
@@ -54,6 +54,7 @@ export default class App {
     async goToNoteInNewTab(noteTitle: string) {
         const autocomplete = this.currentNoteSplit.locator(".note-autocomplete");
         await autocomplete.fill(noteTitle);
+        await expect(this.currentNoteSplit.locator(".note-detail-empty-results")).toContainText(noteTitle);
         await autocomplete.press("ArrowDown");
         await autocomplete.press("Enter");
     }