diff --git a/packages/app-tests/e2e/documents/cancel-documents.spec.ts b/packages/app-tests/e2e/documents/cancel-documents.spec.ts
index 9554fac34..c814dd169 100644
--- a/packages/app-tests/e2e/documents/cancel-documents.spec.ts
+++ b/packages/app-tests/e2e/documents/cancel-documents.spec.ts
@@ -67,7 +67,9 @@ test('[DOCUMENTS]: cancelling a pending document keeps it in the owner dashboard
   await checkDocumentTabCount(page, 'All', 1);
 
   // The cancelled document is still listed.
-  await page.getByRole('tab', { name: 'Cancelled' }).click();
+  await page.getByRole('button', { name: /Status/ }).click();
+  await page.getByRole('option', { name: 'Cancelled' }).click();
+  await page.keyboard.press('Escape');
   await expect(page.getByRole('link', { name: 'Document 1 - Pending' })).toBeVisible();
 
   // The envelope status is persisted as CANCELLED.
@@ -131,7 +133,9 @@ test('[DOCUMENTS]: a cancelled document can be deleted, hiding it from the owner
   await expectToastTextToBeVisible(page, 'Document cancelled');
 
   // Delete the now-cancelled document. Being terminal, it should soft delete (hide).
-  await page.getByRole('tab', { name: 'Cancelled' }).click();
+  await page.getByRole('button', { name: /Status/ }).click();
+  await page.getByRole('option', { name: 'Cancelled' }).click();
+  await page.keyboard.press('Escape');
 
   const documentActionBtn = page
     .locator('tr', { hasText: 'Document 1 - Pending' })
diff --git a/packages/app-tests/e2e/documents/find-documents.spec.ts b/packages/app-tests/e2e/documents/find-documents.spec.ts
index e8eee34e6..b9a9d42c0 100644
--- a/packages/app-tests/e2e/documents/find-documents.spec.ts
+++ b/packages/app-tests/e2e/documents/find-documents.spec.ts
@@ -807,8 +807,8 @@ test.describe('Find Documents UI - Data Isolation & No Leaking', () => {
     await checkDocumentTabCount(page, 'Draft', 1);
     await checkDocumentTabCount(page, 'Completed', 1);
 
-    // Verify no B docs leaked
-    await page.getByRole('tab', { name: 'All' }).click();
+    // Verify no B docs leaked (default view shows all statuses)
+    await page.goto(`/t/${teamA.url}/documents`);
     await expect(page.getByRole('link', { name: 'A Own Draft' })).toBeVisible();
     await expect(page.getByRole('link', { name: 'B Draft Private', exact: true })).not.toBeVisible();
     await expect(page.getByRole('link', { name: 'B Pending Private', exact: true })).not.toBeVisible();
@@ -1156,7 +1156,7 @@ test.describe('Find Documents UI - Sender Filter', () => {
     await checkDocumentTabCount(page, 'All', 3);
 
     // Filter by member1
-    await page.locator('button').filter({ hasText: 'Sender: All' }).click();
+    await page.getByRole('button', { name: /Sender/ }).click();
     await page.getByRole('option', { name: member1.name ?? '' }).click();
     await page.waitForURL(/senderIds/);
 
diff --git a/packages/app-tests/e2e/fixtures/documents.ts b/packages/app-tests/e2e/fixtures/documents.ts
index 3a2aa422b..8509eb431 100644
--- a/packages/app-tests/e2e/fixtures/documents.ts
+++ b/packages/app-tests/e2e/fixtures/documents.ts
@@ -7,6 +7,8 @@ export const checkDocumentTabCount = async (page: Page, tabName: string, count:
     Pending: 'PENDING',
     Completed: 'COMPLETED',
     Draft: 'DRAFT',
+    Cancelled: 'CANCELLED',
+    Rejected: 'REJECTED',
     All: undefined,
   };