diff --git a/packages/block-editor/src/components/block-button/index.js b/packages/block-editor/src/components/block-button/index.js
index 3707f63ff1c8bb..3facf06faefa9e 100644
--- a/packages/block-editor/src/components/block-button/index.js
+++ b/packages/block-editor/src/components/block-button/index.js
@@ -13,6 +13,11 @@ export default class BlockButton extends Component {
 		const newProps = { ...this.props };
 		newProps.className += ' wp-element-button';
 
+		// If children are set then we only need a button, not RichText.
+		if ( newProps.children ) {
+			return <button { ...newProps } />;
+		}
+
 		if ( this.props.frontEnd ) {
 			return <RichText.Content { ...newProps } />;
 		}
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index 89dbe7ff251324..302c04ad0f3c87 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -254,8 +254,8 @@ export default function SearchEdit( {
 
 		return (
 			<>
-				{ buttonUseIcon && ( // TODO
-					<button
+				{ buttonUseIcon && (
+					<BlockButton
 						type="button"
 						className={ buttonClasses }
 						style={ buttonStyles }
@@ -266,7 +266,7 @@ export default function SearchEdit( {
 						}
 					>
 						<Icon icon={ search } />
-					</button>
+					</BlockButton>
 				) }
 
 				{ ! buttonUseIcon && (