diff --git a/e2e/tests/plugin-list-task_list.spec.ts b/e2e/tests/plugin-list-task_list.spec.ts
index 07f86e3c8..62a678edf 100644
--- a/e2e/tests/plugin-list-task_list.spec.ts
+++ b/e2e/tests/plugin-list-task_list.spec.ts
@@ -54,6 +54,9 @@ test('task list', async ({ page }) => {
     ).toHaveValue('Wash the car')
     await contentWrapper.getByText('Mark task as complete').click()
     await contentWrapper.getByRole('button', { name: 'Submit' }).click()
+    await expect(
+      contentWrapper.getByRole('button', { name: 'Submit' })
+    ).toBeDisabled()
     await expect(page.getByRole('alert')).toHaveText(['Document updated'])
     await page.getByLabel('Close task_list').click()
     await page.getByTestId('task_list').getByLabel('Open in tab').click()
diff --git a/e2e/tests/plugin-view_selector-car_garage.spec.ts b/e2e/tests/plugin-view_selector-car_garage.spec.ts
index f1d1aa73f..a5063522c 100644
--- a/e2e/tests/plugin-view_selector-car_garage.spec.ts
+++ b/e2e/tests/plugin-view_selector-car_garage.spec.ts
@@ -13,7 +13,7 @@ test('View selector - car garage', async ({ page }) => {
 
   await test.step('Collapse and expand sidebar', async () => {
     await page.getByRole('tab', { name: 'Self' }).click()
-    await page.getByRole('button', { name: 'Collapse' }).click()
+    await page.getByRole('button', { name: 'Collapse item' }).click()
     await expect(page.getByRole('tab', { name: 'Self' })).not.toBeVisible()
     await expect(page.getByRole('tab', { name: 'Audi' })).not.toBeVisible()
     await expect(page.getByRole('tab', { name: 'Volvo' })).not.toBeVisible()
@@ -23,7 +23,7 @@ test('View selector - car garage', async ({ page }) => {
     )
     await page.getByRole('tab').first().click()
     await expect(page.getByLabel('Name')).toHaveValue('CarGarage')
-    await page.getByRole('button', { name: 'Expand' }).click()
+    await page.getByRole('button', { name: 'Expand item' }).click()
     await expect(page.getByRole('tab', { name: 'Self' })).toBeVisible()
     await expect(page.getByRole('tab', { name: 'Audi' })).toBeVisible()
     await expect(page.getByRole('tab', { name: 'Volvo' })).toBeVisible()
diff --git a/packages/dm-core-plugins/src/explorer/components/context-menu/getMenuItems.tsx b/packages/dm-core-plugins/src/explorer/components/context-menu/getMenuItems.tsx
index 87a557026..ffb02b049 100644
--- a/packages/dm-core-plugins/src/explorer/components/context-menu/getMenuItems.tsx
+++ b/packages/dm-core-plugins/src/explorer/components/context-menu/getMenuItems.tsx
@@ -15,7 +15,7 @@ export function getMenuItems(
   const menuItems = []
   const getMenuItem = (id: EDialog, text: string) => {
     return (
-      <Menu.Item key={id} onClick={() => setDialogId(id)}>
+      <Menu.Item key={id} onClick={() => setDialogId(id)} aria-label={text}>
         {text}
       </Menu.Item>
     )