diff --git a/web-app/src/screens/Console/Buckets/ListBuckets/UploadFilesButton.tsx b/web-app/src/screens/Console/Buckets/ListBuckets/UploadFilesButton.tsx
index 2567d3465..0496b1665 100644
--- a/web-app/src/screens/Console/Buckets/ListBuckets/UploadFilesButton.tsx
+++ b/web-app/src/screens/Console/Buckets/ListBuckets/UploadFilesButton.tsx
@@ -148,7 +148,7 @@ const UploadFilesButton = ({
         open={uploadOptionsOpen}
         anchorEl={anchorEl}
         anchorOrigin={"end"}
-        useAnchorWidth={false}
+        useAnchorWidth
       />
     </Fragment>
   );
diff --git a/web-app/tests/permissions-B/bucketWritePrefixOnly.ts b/web-app/tests/permissions-B/bucketWritePrefixOnly.ts
index f97e36743..e6c8050a6 100644
--- a/web-app/tests/permissions-B/bucketWritePrefixOnly.ts
+++ b/web-app/tests/permissions-B/bucketWritePrefixOnly.ts
@@ -31,9 +31,17 @@ test
         .useRole(roles.bucketWritePrefixOnly)
         .navigateTo("http://localhost:9090/browser/testcafe")
         .click(uploadButton)
-        .expect(Selector("li").withText("Upload File").hasClass("disabled"))
+        .expect(
+          Selector("div")
+            .withAttribute("label", "Upload File")
+            .hasClass("disabled"),
+        )
         .ok()
-        .expect(Selector("li").withText("Upload Folder").hasClass("disabled"))
+        .expect(
+          Selector("div")
+            .withAttribute("label", "Upload Folder")
+            .hasClass("disabled"),
+        )
         .notOk();
     },
   )
@@ -48,9 +56,17 @@ test
         .useRole(roles.bucketWritePrefixOnly)
         .navigateTo("http://localhost:9090/browser/testcafe/d3JpdGU=")
         .click(uploadButton)
-        .expect(Selector("li").withText("Upload File").hasClass("disabled"))
+        .expect(
+          Selector("div")
+            .withAttribute("label", "Upload File")
+            .hasClass("disabled"),
+        )
         .notOk()
-        .expect(Selector("li").withText("Upload Folder").hasClass("disabled"))
+        .expect(
+          Selector("div")
+            .withAttribute("label", "Upload Folder")
+            .hasClass("disabled"),
+        )
         .notOk();
     },
   )
diff --git a/web-app/tests/utils/elements.ts b/web-app/tests/utils/elements.ts
index 1ccc9606a..68d491243 100644
--- a/web-app/tests/utils/elements.ts
+++ b/web-app/tests/utils/elements.ts
@@ -63,9 +63,18 @@ export const deleteAllVersions =
 export const bucketNameInput = Selector("#bucket-name-select");
 export const bucketsPrefixInput = Selector("#prefix");
 export const bucketsAccessInput = Selector("div.selectContainer");
-export const bucketsAccessReadOnlyInput = Selector("li").withText("readonly");
-export const bucketsAccessWriteOnlyInput = Selector("li").withText("writeonly");
-export const bucketsAccessReadWriteInput = Selector("li").withText("readwrite");
+export const bucketsAccessReadOnlyInput = Selector("div").withAttribute(
+  "label",
+  "readonly",
+);
+export const bucketsAccessWriteOnlyInput = Selector("div").withAttribute(
+  "label",
+  "writeonly",
+);
+export const bucketsAccessReadWriteInput = Selector("div").withAttribute(
+  "label",
+  "readwrite",
+);
 export const uploadInput = Selector("input").withAttribute("type", "file");
 export const createPolicyName = Selector("#policy-name");
 export const createPolicyTextfield = Selector(".w-tc-editor-text");
@@ -86,7 +95,7 @@ export const groupUserCheckbox = Selector(".ReactVirtualized__Table__row input")
 // Dropdowns and options
 //----------------------------------------------------
 export const bucketDropdownOptionFor = (modifier) => {
-  return Selector("#bucket-name-options-selector li").withText(
+  return Selector("#bucket-name-options-selector div").withText(
     `${constants.TEST_BUCKET_NAME}-${modifier}`,
   );
 };