diff --git a/tests/e2e/box-brush-authoring.e2e.ts b/tests/e2e/box-brush-authoring.e2e.ts
index f1e76bad..378a2164 100644
--- a/tests/e2e/box-brush-authoring.e2e.ts
+++ b/tests/e2e/box-brush-authoring.e2e.ts
@@ -59,18 +59,29 @@ test("switching selection while a transform input is active does not overwrite t
   }, "webeditor3d.scene-document-draft");
   await page.reload();
 
+  const viewportCanvas = page.locator('[data-testid="viewport-shell"] canvas');
   await page.getByRole("button", { name: "Box Create" }).click();
-  await page.getByTestId("viewport-fallback-create-box").click();
+  if ((await viewportCanvas.count()) > 0) {
+    await viewportCanvas.click();
+  } else {
+    await page.getByTestId("viewport-fallback-create-box").click();
+  }
   await page.getByRole("button", { name: "Box Create" }).click();
-  await page.getByTestId("viewport-fallback-create-box").click();
+  if ((await viewportCanvas.count()) > 0) {
+    await viewportCanvas.click();
+  } else {
+    await page.getByTestId("viewport-fallback-create-box").click();
+  }
 
-  await page.getByTestId("outliner-brush-brush-1").click();
+  const outlinerButtons = page.getByTestId("outliner-brush-list").getByRole("button");
+
+  await outlinerButtons.nth(0).click();
   await page.getByTestId("brush-size-z").fill("4");
-  await page.getByTestId("outliner-brush-brush-2").click();
+  await outlinerButtons.nth(1).click();
 
   await expect(page.getByText("1 brush selected (Box Brush 2)")).toBeVisible();
   await expect(page.getByTestId("brush-size-z")).toHaveValue("2");
 
-  await page.getByTestId("outliner-brush-brush-1").click();
+  await outlinerButtons.nth(0).click();
   await expect(page.getByTestId("brush-size-z")).toHaveValue("4");
 });