diff --git a/packages/components/src/custom-select-control/index.js b/packages/components/src/custom-select-control/index.js
index b83f1d4625c229..b69cef26df19ce 100644
--- a/packages/components/src/custom-select-control/index.js
+++ b/packages/components/src/custom-select-control/index.js
@@ -11,7 +11,7 @@ import { __, sprintf } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { DropdownMenu, MenuGroup, MenuItem, VisuallyHidden } from '../';
+import { DropdownMenu, MenuItem, VisuallyHidden } from '../';
 
 const itemToString = ( item ) => item?.name;
 
@@ -61,6 +61,10 @@ export default function CustomSelectControlWithDropdownMenu( {
 		),
 	};
 
+	const menuProps = {
+		role: 'select',
+	};
+
 	return (
 		<div
 			className={ classnames(
@@ -85,6 +89,7 @@ export default function CustomSelectControlWithDropdownMenu( {
 					'components-custom-select-control__inner',
 					className
 				) }
+				menuProps={ menuProps }
 				popoverProps={ POPOVER_PROPS }
 				toggleProps={ toggleProps }
 				icon={ null }
@@ -92,10 +97,11 @@ export default function CustomSelectControlWithDropdownMenu( {
 			>
 				{ ( { isOpen, onClose } ) =>
 					isOpen && (
-						<MenuGroup>
+						<>
 							{ items.map( ( item, index ) => (
 								<MenuItem
 									key={ index }
+									role="option"
 									{ ...{
 										className: classnames(
 											item.className,
@@ -126,7 +132,7 @@ export default function CustomSelectControlWithDropdownMenu( {
 									) }
 								</MenuItem>
 							) ) }
-						</MenuGroup>
+						</>
 					)
 				}
 			</DropdownMenu>
diff --git a/packages/components/src/dropdown-menu/index.js b/packages/components/src/dropdown-menu/index.js
index 85983f92305aca..dddaa5fd00b828 100644
--- a/packages/components/src/dropdown-menu/index.js
+++ b/packages/components/src/dropdown-menu/index.js
@@ -134,7 +134,7 @@ function DropdownMenu( dropdownMenuProps ) {
 				);
 
 				return (
-					<NavigableMenu { ...mergedMenuProps } role="menu">
+					<NavigableMenu role="menu" { ...mergedMenuProps }>
 						{ isFunction( children ) ? children( props ) : null }
 						{ flatMap( controlSets, ( controlSet, indexOfSet ) =>
 							controlSet.map( ( control, indexOfControl ) => (