diff --git a/cypress/e2e/files_sharing/FilesSharingUtils.ts b/cypress/e2e/files_sharing/FilesSharingUtils.ts
index 4bf47990401..23adfa9d19f 100644
--- a/cypress/e2e/files_sharing/FilesSharingUtils.ts
+++ b/cypress/e2e/files_sharing/FilesSharingUtils.ts
@@ -19,9 +19,9 @@ export function createShare(fileName: string, username: string, shareSettings: P
 	openSharingPanel(fileName)
 
 	cy.get('#app-sidebar-vue').within(() => {
-		cy.get('#sharing-search-input').clear()
 		cy.intercept({ times: 1, method: 'GET', url: '**/apps/files_sharing/api/v1/sharees?*' }).as('userSearch')
-		cy.get('#sharing-search-input').type(username)
+		cy.findByRole('combobox', { name: /Search for share recipients/i })
+			.type(`{selectAll}${username}`)
 		cy.wait('@userSearch')
 	})
 
diff --git a/cypress/e2e/files_sharing/public-share/setup-public-share.ts b/cypress/e2e/files_sharing/public-share/setup-public-share.ts
index ac40d318592..64eeb8e8e82 100644
--- a/cypress/e2e/files_sharing/public-share/setup-public-share.ts
+++ b/cypress/e2e/files_sharing/public-share/setup-public-share.ts
@@ -118,15 +118,24 @@ export function createShare(context: ShareContext, shareName: string, options: S
 }
 
 /**
- * Adjust share permissions to be editable
+ * open link share details for specific index
+ *
+ * @param index
  */
-function adjustSharePermission(): void {
+export function openLinkShareDetails(index: number) {
 	cy.findByRole('list', { name: 'Link shares' })
 		.findAllByRole('listitem')
-		.first()
+		.eq(index)
 		.findByRole('button', { name: /Actions/i })
 		.click()
 	cy.findByRole('menuitem', { name: /Customize link/i }).click()
+}
+
+/**
+ * Adjust share permissions to be editable
+ */
+function adjustSharePermission(): void {
+	openLinkShareDetails(0)
 
 	cy.get('[data-cy-files-sharing-share-permissions-bundle]').should('be.visible')
 	cy.get('[data-cy-files-sharing-share-permissions-bundle="upload-edit"]').click()