diff --git a/packages/editor/src/components/autocompleters/block.js b/packages/editor/src/components/autocompleters/block.js
index 746928ea7752ec..f0df5df77ea8ed 100644
--- a/packages/editor/src/components/autocompleters/block.js
+++ b/packages/editor/src/components/autocompleters/block.js
@@ -54,7 +54,7 @@ export function createBlockCompleter( {
 } = {} ) {
 	return {
 		name: 'blocks',
-		className: 'editor-autocompleters__block',
+		className: 'block-editor-autocompleters__block',
 		triggerPrefix: '/',
 		options() {
 			const selectedBlockName = getSelectedBlockName();
diff --git a/packages/editor/src/components/autocompleters/user.js b/packages/editor/src/components/autocompleters/user.js
index 0ca90dad349675..e566746399538f 100644
--- a/packages/editor/src/components/autocompleters/user.js
+++ b/packages/editor/src/components/autocompleters/user.js
@@ -10,7 +10,7 @@ import apiFetch from '@wordpress/api-fetch';
 */
 export default {
 	name: 'users',
-	className: 'editor-autocompleters__user',
+	className: 'block-editor-autocompleters__user',
 	triggerPrefix: '@',
 	options( search ) {
 		let payload = '';
@@ -25,9 +25,9 @@ export default {
 	},
 	getOptionLabel( user ) {
 		return [
-			<img key="avatar" className="editor-autocompleters__user-avatar" alt="" src={ user.avatar_urls[ 24 ] } />,
-			<span key="name" className="editor-autocompleters__user-name">{ user.name }</span>,
-			<span key="slug" className="editor-autocompleters__user-slug">{ user.slug }</span>,
+			<img key="avatar" className="block-editor-autocompleters__user-avatar" alt="" src={ user.avatar_urls[ 24 ] } />,
+			<span key="name" className="block-editor-autocompleters__user-name">{ user.name }</span>,
+			<span key="slug" className="block-editor-autocompleters__user-slug">{ user.slug }</span>,
 		];
 	},
 	getOptionCompletion( user ) {