diff --git a/packages/edit-site/src/components/page-patterns/grid.js b/packages/edit-site/src/components/page-patterns/grid.js
index 32fa6ebe55b39d..59a8cc431567f9 100644
--- a/packages/edit-site/src/components/page-patterns/grid.js
+++ b/packages/edit-site/src/components/page-patterns/grid.js
@@ -9,7 +9,7 @@ export default function Grid( { categoryId, items, ...props } ) {
 	}
 
 	return (
-		<ul role="listbox" className="edit-site-patterns__grid" { ...props }>
+		<ul className="edit-site-patterns__grid" { ...props }>
 			{ items.map( ( item ) => (
 				<GridItem
 					key={ item.name }
diff --git a/test/e2e/specs/site-editor/patterns.spec.js b/test/e2e/specs/site-editor/patterns.spec.js
index 2e2faefba092c5..6703deb0285faf 100644
--- a/test/e2e/specs/site-editor/patterns.spec.js
+++ b/test/e2e/specs/site-editor/patterns.spec.js
@@ -88,13 +88,13 @@ test.describe( 'Patterns', () => {
 
 		await expect(
 			navigation.getByRole( 'button', { name: 'All patterns' } )
-		).toBeVisible();
+		).toContainText( '1' );
 		await expect(
 			navigation.getByRole( 'button', { name: 'My patterns' } )
-		).toBeVisible();
+		).toContainText( '1' );
 		await expect(
 			navigation.getByRole( 'button', { name: 'Uncategorized' } )
-		).toBeVisible();
+		).toContainText( '1' );
 
 		await expect(
 			patternsContent.getByRole( 'heading', {
@@ -102,13 +102,14 @@ test.describe( 'Patterns', () => {
 				level: 2,
 			} )
 		).toBeVisible();
+		const patternsList = patternsContent.getByRole( 'list', {
+			name: 'All patterns',
+		} );
+		await expect( patternsList.getByRole( 'listitem' ) ).toHaveCount( 1 );
 		await expect(
-			patternsContent
-				.getByRole( 'listbox', { name: 'All patterns' } )
-				// TODO: should be `getByRole( 'option', { name: 'My pattern' } )`
+			patternsList
+				.getByRole( 'heading', { name: 'My pattern' } )
 				.getByRole( 'button', { name: 'My pattern', exact: true } )
-				// TODO: Shouldn't need this.
-				.nth( 0 )
 		).toBeVisible();
 	} );
 } );