diff --git a/assets/js/blocks/product-search/edit.js b/assets/js/blocks/product-search/edit.js
index 8d22a426305..ca666b14d5f 100644
--- a/assets/js/blocks/product-search/edit.js
+++ b/assets/js/blocks/product-search/edit.js
@@ -1,10 +1,16 @@
+/* eslint-disable @wordpress/no-unsafe-wp-apis */
+
 /**
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import { InspectorControls, PlainText } from '@wordpress/block-editor';
+import {
+	InspectorControls,
+	PlainText,
+	__experimentalElementButtonClassName,
+} from '@wordpress/block-editor';
 import { PanelBody, ToggleControl, TextControl } from '@wordpress/components';
 import { withInstanceId } from '@wordpress/compose';
 import { useEffect } from '@wordpress/element';
@@ -114,7 +120,10 @@ const Edit = ( {
 					/>
 					<button
 						type="submit"
-						className="wc-block-product-search__button"
+						className={ classnames(
+							'wc-block-product-search__button',
+							__experimentalElementButtonClassName
+						) }
 						label={ __( 'Search', 'woo-gutenberg-products-block' ) }
 						onClick={ ( e ) => e.preventDefault() }
 						tabIndex="-1"
diff --git a/assets/js/blocks/product-search/editor.scss b/assets/js/blocks/product-search/editor.scss
index 224f0ce39e6..1bb3e20c8cb 100644
--- a/assets/js/blocks/product-search/editor.scss
+++ b/assets/js/blocks/product-search/editor.scss
@@ -13,4 +13,7 @@
 			flex-grow: 1;
 		}
 	}
+	.wc-block-product-search__field {
+		border: 0;
+	}
 }
diff --git a/assets/js/blocks/product-search/style.scss b/assets/js/blocks/product-search/style.scss
index 56cc636f923..38e5c4d5002 100644
--- a/assets/js/blocks/product-search/style.scss
+++ b/assets/js/blocks/product-search/style.scss
@@ -1,4 +1,4 @@
-.wc-block-product-search {
+:where(.wc-block-product-search) {
 	.wc-block-product-search__fields {
 		display: flex;
 	}
@@ -6,11 +6,21 @@
 		padding: 6px 8px;
 		line-height: 1.8;
 		flex-grow: 1;
+		border-style: solid;
+		border-width: 1px;
 	}
+
+	.wc-block-product-search__field,
+	.wc-block-product-search__field > * {
+		display: flex;
+		flex-grow: 1;
+	}
+
 	.wc-block-product-search__button {
 		display: flex;
 		align-items: center;
-		margin: 0 0 0 6px;
+		border: 1px solid #ccc;
+		margin: 0 0 0 0.625em;
 		cursor: pointer;
 		padding: 0 0.5em;
 		position: relative;
diff --git a/src/BlockTypes/ProductSearch.php b/src/BlockTypes/ProductSearch.php
index 613aa67d77d..1e803c4af75 100644
--- a/src/BlockTypes/ProductSearch.php
+++ b/src/BlockTypes/ProductSearch.php
@@ -102,7 +102,7 @@ protected function render( $attributes, $content ) {
 			esc_attr( $attributes['placeholder'] )
 		);
 		$button_markup = sprintf(
-			'<button type="submit" class="wc-block-product-search__button" aria-label="%s">
+			'<button type="submit" class="wc-block-product-search__button wp-element-button" aria-label="%s">
 				<svg aria-hidden="true" role="img" focusable="false" class="dashicon dashicons-arrow-right-alt2" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
 					<path d="M6 15l5-5-5-5 1-2 7 7-7 7z" />
 				</svg>