diff --git a/assets/js/blocks/featured-product/index.js b/assets/js/blocks/featured-product/index.js
index 07da5413e2f..08339aeb39c 100644
--- a/assets/js/blocks/featured-product/index.js
+++ b/assets/js/blocks/featured-product/index.js
@@ -29,6 +29,7 @@ registerBlockType( 'woocommerce/featured-product', {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		/**
diff --git a/assets/js/blocks/handpicked-products/index.js b/assets/js/blocks/handpicked-products/index.js
index cf33ae7904c..e20a248eaaf 100644
--- a/assets/js/blocks/handpicked-products/index.js
+++ b/assets/js/blocks/handpicked-products/index.js
@@ -26,6 +26,7 @@ registerBlockType( 'woocommerce/handpicked-products', {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		/**
diff --git a/assets/js/blocks/product-best-sellers/index.js b/assets/js/blocks/product-best-sellers/index.js
index 6eae7043d58..0ea07cc471c 100644
--- a/assets/js/blocks/product-best-sellers/index.js
+++ b/assets/js/blocks/product-best-sellers/index.js
@@ -27,6 +27,7 @@ registerBlockType( 'woocommerce/product-best-sellers', {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		...sharedAttributes,
diff --git a/assets/js/blocks/product-category/index.js b/assets/js/blocks/product-category/index.js
index 516393aa133..8047d45107a 100644
--- a/assets/js/blocks/product-category/index.js
+++ b/assets/js/blocks/product-category/index.js
@@ -30,6 +30,7 @@ registerBlockType( 'woocommerce/product-category', {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		...sharedAttributes,
diff --git a/assets/js/blocks/product-search/block.js b/assets/js/blocks/product-search/block.js
index 9ff1ec1b3de..b0d2d3f902f 100644
--- a/assets/js/blocks/product-search/block.js
+++ b/assets/js/blocks/product-search/block.js
@@ -93,7 +93,7 @@ class ProductSearchBlock extends Component {
 						className="wc-block-product-search__button"
 						label={ __( 'Search', 'woo-gutenberg-products-block' ) }
 						onClick={ ( e ) => e.preventDefault() }
-						tabindex="-1"
+						tabIndex="-1"
 					>
 						<svg aria-hidden="true" role="img" focusable="false" className="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"></path>
diff --git a/assets/js/blocks/product-tag/index.js b/assets/js/blocks/product-tag/index.js
index d23ff4eeea4..d5d4c7ce67e 100644
--- a/assets/js/blocks/product-tag/index.js
+++ b/assets/js/blocks/product-tag/index.js
@@ -27,6 +27,7 @@ registerBlockType( 'woocommerce/product-tag', {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		/**
diff --git a/assets/js/blocks/product-top-rated/index.js b/assets/js/blocks/product-top-rated/index.js
index 39aaf389a73..16d5a65fb56 100644
--- a/assets/js/blocks/product-top-rated/index.js
+++ b/assets/js/blocks/product-top-rated/index.js
@@ -29,6 +29,7 @@ registerBlockType( blockTypeName, {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		...sharedAttributes,
diff --git a/assets/js/blocks/products-by-attribute/index.js b/assets/js/blocks/products-by-attribute/index.js
index 3e73a186367..ed059b20157 100644
--- a/assets/js/blocks/products-by-attribute/index.js
+++ b/assets/js/blocks/products-by-attribute/index.js
@@ -28,6 +28,7 @@ registerBlockType( blockTypeName, {
 	),
 	supports: {
 		align: [ 'wide', 'full' ],
+		html: false,
 	},
 	attributes: {
 		/**