diff --git a/web_src/js/features/aria.js b/web_src/js/features/aria.js
index 676f4cd56c..2f3ab1acd2 100644
--- a/web_src/js/features/aria.js
+++ b/web_src/js/features/aria.js
@@ -34,8 +34,8 @@ function attachOneDropdownAria($dropdown) {
   // Since #19861 we have prepared the "combobox" solution, but didn't get enough time to put it into practice and test before.
   const isComboBox = $dropdown.find('input').length > 0;
 
-  const focusableRole = isComboBox ? 'combobox' : 'button';
-  const listPopupRole = isComboBox ? 'listbox' : 'menu';
+  const focusableRole = isComboBox ? 'combobox' : 'menu';
+  const listPopupRole = isComboBox ? 'listbox' : '';
   const listItemRole = isComboBox ? 'option' : 'menuitem';
 
   // make the item has role=option/menuitem, add an id if there wasn't one yet, make items as non-focusable