diff --git a/packages/web-app-files/src/components/Collaborators/CollaboratorsEditOptions.vue b/packages/web-app-files/src/components/Collaborators/CollaboratorsEditOptions.vue
index 6c0b53e33e6..e6cd537c4b0 100644
--- a/packages/web-app-files/src/components/Collaborators/CollaboratorsEditOptions.vue
+++ b/packages/web-app-files/src/components/Collaborators/CollaboratorsEditOptions.vue
@@ -4,6 +4,7 @@
     <oc-select
       v-model="selectedRole"
       input-id="files-collaborators-role-button"
+      class="files-collaborators-role-button-wrapper"
       :options="roles"
       :clearable="false"
       label="label"
diff --git a/packages/web-app-files/src/components/PublicLinksSidebar/EditPublicLink.vue b/packages/web-app-files/src/components/PublicLinksSidebar/EditPublicLink.vue
index 8fc6e999e45..d54d2a4473e 100644
--- a/packages/web-app-files/src/components/PublicLinksSidebar/EditPublicLink.vue
+++ b/packages/web-app-files/src/components/PublicLinksSidebar/EditPublicLink.vue
@@ -22,7 +22,7 @@
         :options="roles"
         :clearable="false"
         label="label"
-        class="oc-mb"
+        class="oc-mb files-file-link-role-button-wrapper"
       >
         <template v-slot:option="option">
           <role-item :role="option" />
diff --git a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js
index b06c8c8c2da..a328bd8646d 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js
@@ -433,7 +433,7 @@ module.exports = {
       selector: '#files-sidebar-private-link-icon-copied'
     },
     publicLinkRoleSelectionDropdown: {
-      selector: '//div[@id="files-file-link-role-button"]//span[.="%s"]',
+      selector: '//div[contains(@class, "files-file-link-role-button-wrapper")]//span[.="%s"]',
       locateStrategy: 'xpath'
     }
   }