diff --git a/packages/block-editor/src/hooks/custom-class-name.js b/packages/block-editor/src/hooks/custom-class-name.js
index c6e7e5409ea99..dd4f4cd8c51e2 100644
--- a/packages/block-editor/src/hooks/custom-class-name.js
+++ b/packages/block-editor/src/hooks/custom-class-name.js
@@ -83,13 +83,13 @@ export const withInspectorControl = createHigherOrderComponent(
 
 			return (
 				<>
+					<BlockEdit { ...props } />
 					{ hasCustomClassName && props.isSelected && (
 						<CustomClassNameControls
 							attributes={ props.attributes }
 							setAttributes={ props.setAttributes }
 						/>
 					) }
-					<BlockEdit { ...props } />
 				</>
 			);
 		};