diff --git a/cypress/e2e/files/files-delete.cy.ts b/cypress/e2e/files/files-delete.cy.ts
index 8d51e82de34..b1af310d9b6 100644
--- a/cypress/e2e/files/files-delete.cy.ts
+++ b/cypress/e2e/files/files-delete.cy.ts
@@ -5,7 +5,7 @@
 
 import type { User } from '@nextcloud/e2e-test-server/cypress'
 
-import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile } from './FilesUtils.ts'
+import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile, triggerSelectionAction } from './FilesUtils.ts'
 
 describe('files: Delete files using file actions', { testIsolation: true }, () => {
 	let user: User
@@ -50,12 +50,7 @@ describe('files: Delete files using file actions', { testIsolation: true }, () =
 
 		// select all
 		selectAllFiles()
-		cy.get('[data-cy-files-list-selection-actions]')
-			.findByRole('button', { name: 'Actions' })
-			.click()
-		cy.get('[data-cy-files-list-selection-action="delete"]')
-			.findByRole('menuitem', { name: /^Delete files/ })
-			.click()
+		triggerSelectionAction('delete')
 
 		// see dialog for confirmation
 		cy.findByRole('dialog', { name: 'Confirm deletion' })
diff --git a/cypress/e2e/files/files-download.cy.ts b/cypress/e2e/files/files-download.cy.ts
index 7e74f7a8b8c..c811a4a4a8e 100644
--- a/cypress/e2e/files/files-download.cy.ts
+++ b/cypress/e2e/files/files-download.cy.ts
@@ -8,7 +8,7 @@ import type { User } from '@nextcloud/e2e-test-server/cypress'
 import { zipFileContains } from '../../support/utils/assertions.ts'
 import { deleteDownloadsFolderBeforeEach } from '../../support/utils/deleteDownloadsFolder.ts'
 import { randomString } from '../../support/utils/randomString.ts'
-import { getRowForFile, navigateToFolder, triggerActionForFile } from './FilesUtils.ts'
+import { getRowForFile, navigateToFolder, triggerActionForFile, triggerSelectionAction } from './FilesUtils.ts'
 
 describe('files: Download files using file actions', { testIsolation: true }, () => {
 	let user: User
@@ -194,12 +194,7 @@ describe('files: Download files using selection', () => {
 		})
 
 		// click download
-		cy.get('[data-cy-files-list-selection-actions]')
-			.findByRole('button', { name: 'Actions' })
-			.click()
-		cy.findByRole('menuitem', { name: 'Download (selected)' })
-			.should('be.visible')
-			.click()
+		triggerSelectionAction('download')
 
 		// check a file is downloaded
 		const downloadsFolder = Cypress.config('downloadsFolder')
@@ -237,11 +232,7 @@ describe('files: Download files using selection', () => {
 		})
 
 		// click download
-		cy.get('[data-cy-files-list-selection-actions]')
-			.findByRole('button', { name: 'Actions' })
-			.click()
-		cy.findByRole('menuitem', { name: 'Download (selected)' })
-			.click()
+		triggerSelectionAction('download')
 
 		// check a file is downloaded
 		const downloadsFolder = Cypress.config('downloadsFolder')
@@ -282,11 +273,7 @@ describe('files: Download files using selection', () => {
 		})
 
 		// click download
-		cy.get('[data-cy-files-list-selection-actions]')
-			.findByRole('button', { name: 'Actions' })
-			.click()
-		cy.findByRole('menuitem', { name: 'Download (selected)' })
-			.click()
+		triggerSelectionAction('download')
 
 		// check a file is downloaded
 		const downloadsFolder = Cypress.config('downloadsFolder')
@@ -330,11 +317,7 @@ describe('files: Download files using selection', () => {
 		})
 
 		// click download
-		cy.get('[data-cy-files-list-selection-actions]')
-			.findByRole('button', { name: 'Actions' })
-			.click()
-		cy.findByRole('menuitem', { name: 'Download (selected)' })
-			.click()
+		triggerSelectionAction('download')
 
 		// check a file is downloaded
 		const downloadsFolder = Cypress.config('downloadsFolder')