diff --git a/e2e/playwright/test-utils.ts b/e2e/playwright/test-utils.ts
index c904c9df3..683b158e3 100644
--- a/e2e/playwright/test-utils.ts
+++ b/e2e/playwright/test-utils.ts
@@ -538,7 +538,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
     cloneFile: async (name: string) => {
       return test?.step(`Cloning file '${name}'`, async () => {
         await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
+          .locator('[data-testid="file-pane-scroll-container"] [role=treeitem]')
           .filter({ hasText: name })
           .click({ button: 'right' })
         await page.getByTestId('context-menu-clone').click()
@@ -548,7 +548,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
     selectFile: async (name: string) => {
       return test?.step(`Select ${name}`, async () => {
         await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
+          .locator('[data-testid="file-pane-scroll-container"] [role=treeitem]')
           .filter({ hasText: name })
           .click()
         await expect(page.getByTestId('project-sidebar-toggle')).toContainText(
@@ -564,7 +564,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
         await page.getByTestId('file-rename-field').fill(name)
         await page.keyboard.press('Enter')
         const newFile = page
-          .locator('[data-testid="file-pane-scroll-container"] button')
+          .locator('[data-testid="file-pane-scroll-container"] [role=treeitem]')
           .filter({ hasText: name })
 
         await expect(newFile).toBeVisible()
@@ -575,14 +575,14 @@ export async function getUtils(page: Page, test_?: typeof test) {
     renameFile: async (fromName: string, toName: string) => {
       return test?.step(`Rename ${fromName} to ${toName}`, async () => {
         await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
+          .locator('[data-testid="file-pane-scroll-container"] [role=treeitem]')
           .filter({ hasText: fromName })
           .click({ button: 'right' })
         await page.getByTestId('context-menu-rename').click()
         await page.getByTestId('file-rename-field').fill(toName)
         await page.keyboard.press('Enter')
         await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
+          .locator('[data-testid="file-pane-scroll-container"] [role=treeitem]')
           .filter({ hasText: toName })
           .click()
       })
@@ -591,7 +591,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
     deleteFile: async (name: string) => {
       return test?.step(`Delete ${name}`, async () => {
         await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
+          .locator('[data-testid="file-pane-scroll-container"] [role=treeitem]')
           .filter({ hasText: name })
           .click({ button: 'right' })
         await page.getByTestId('context-menu-delete').click()
diff --git a/src/components/Explorer/ProjectExplorer.tsx b/src/components/Explorer/ProjectExplorer.tsx
index 7e35db109..c7ce4f496 100644
--- a/src/components/Explorer/ProjectExplorer.tsx
+++ b/src/components/Explorer/ProjectExplorer.tsx
@@ -657,6 +657,7 @@ export const ProjectExplorer = ({
     >
       <div
         className={`absolute w-full h-full ${activeIndex === -1 ? 'border-sky-500' : ''}`}
+        data-testid="file-pane-scroll-container"
         tabIndex={0}
         role="tree"
         aria-label="Files Explorer"