diff --git a/apps/web/__e2e__/models/item.model.ts b/apps/web/__e2e__/models/item.model.ts
index 77e2a0341..0b79bce5c 100644
--- a/apps/web/__e2e__/models/item.model.ts
+++ b/apps/web/__e2e__/models/item.model.ts
@@ -36,7 +36,14 @@ export class ItemModel extends BaseItemModel {
     return new NotesViewModel(this.page, "notes");
   }
 
-  async delete(deleteContainedNotes = false) {
+  async delete() {
+    await this.contextMenu.open(this.locator);
+    await this.contextMenu.clickOnItem("delete");
+
+    await this.waitFor("detached");
+  }
+
+  async deleteWithNotes(deleteContainedNotes = false) {
     await this.contextMenu.open(this.locator);
     await this.contextMenu.clickOnItem("delete");
 
diff --git a/apps/web/__e2e__/models/items-view.model.ts b/apps/web/__e2e__/models/items-view.model.ts
index af72415aa..7649f6d2a 100644
--- a/apps/web/__e2e__/models/items-view.model.ts
+++ b/apps/web/__e2e__/models/items-view.model.ts
@@ -21,7 +21,6 @@ import { Locator, Page } from "@playwright/test";
 import { getTestId } from "../utils";
 import { BaseViewModel } from "./base-view.model";
 import { ItemModel } from "./item.model";
-import { SearchViewModel } from "./search-view-model";
 import { Item } from "./types";
 import { fillItemDialog } from "./utils";
 
diff --git a/apps/web/__e2e__/models/notebooks-view.model.ts b/apps/web/__e2e__/models/notebooks-view.model.ts
index e7ea1f499..f16519db5 100644
--- a/apps/web/__e2e__/models/notebooks-view.model.ts
+++ b/apps/web/__e2e__/models/notebooks-view.model.ts
@@ -29,7 +29,9 @@ export class NotebooksViewModel extends BaseViewModel {
 
   constructor(page: Page) {
     super(page, "notebooks");
-    this.createButton = this.list.locator(getTestId("notebooks-action-button"));
+    this.createButton = page
+      .locator(getTestId("notebooks-action-button"))
+      .first();
   }
 
   async createNotebook(notebook: Notebook) {
diff --git a/apps/web/__e2e__/models/notes-view.model.ts b/apps/web/__e2e__/models/notes-view.model.ts
index 68371bb7a..3557b4e0e 100644
--- a/apps/web/__e2e__/models/notes-view.model.ts
+++ b/apps/web/__e2e__/models/notes-view.model.ts
@@ -34,7 +34,7 @@ export class NotesViewModel extends BaseViewModel {
 
   constructor(page: Page, pageId: "home" | "notes") {
     super(page, pageId);
-    this.createButton = this.list.locator(getTestId("notes-action-button"));
+    this.createButton = page.locator(getTestId("notes-action-button"));
     this.editor = new EditorModel(page);
   }
 
diff --git a/apps/web/__e2e__/topics.test.ts b/apps/web/__e2e__/topics.test.ts
index e931672ca..1561ccd42 100644
--- a/apps/web/__e2e__/topics.test.ts
+++ b/apps/web/__e2e__/topics.test.ts
@@ -67,7 +67,7 @@ test("delete a topic", async ({ page }) => {
   const topics = await notebook?.openNotebook();
   const topic = await topics?.findItem({ title: NOTEBOOK.topics[0] });
 
-  await topic?.delete();
+  await topic?.deleteWithNotes();
 
   expect(await app.toasts.waitForToast("1 topic deleted")).toBe(true);
   expect(await topics?.findItem({ title: NOTEBOOK.topics[0] })).toBeUndefined();
@@ -109,7 +109,7 @@ test("delete all notes within a topic", async ({ page }) => {
   }
   await app.goBack();
 
-  await topic?.delete(true);
+  await topic?.deleteWithNotes(true);
 
   notes = await app.goToNotes();
   expect(await notes.isEmpty()).toBe(true);