diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/edit.tsx
index ffe4a31c78c..084ca3fbe6c 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/edit.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/edit.tsx
@@ -32,6 +32,7 @@ import { EXCLUDED_BLOCKS } from '../../constants';
 import { Notice } from '../../components/notice';
 import type { Attributes } from './types';
 import './style.scss';
+import { InitialDisabled } from '../../components/initial-disabled';
 
 const RatingFilterEdit = ( props: BlockEditProps< Attributes > ) => {
 	const { attributes, setAttributes } = props;
@@ -189,30 +190,32 @@ const RatingFilterEdit = ( props: BlockEditProps< Attributes > ) => {
 			/>
 
 			<div { ...innerBlocksProps }>
-				{ showNoProductsNotice && (
-					<Notice>
-						{ __(
-							"Your store doesn't have any products with ratings yet. This filter option will display when a product receives a review.",
-							'woocommerce'
-						) }
-					</Notice>
-				) }
-				<div
-					className={ clsx( {
-						'is-loading': isLoading,
-					} ) }
-				>
-					<BlockContextProvider
-						value={ {
-							filterData: {
-								items: displayedOptions,
-								isLoading,
-							},
-						} }
+				<InitialDisabled>
+					{ showNoProductsNotice && (
+						<Notice>
+							{ __(
+								"Your store doesn't have any products with ratings yet. This filter option will display when a product receives a review.",
+								'woocommerce'
+							) }
+						</Notice>
+					) }
+					<div
+						className={ clsx( {
+							'is-loading': isLoading,
+						} ) }
 					>
-						{ children }
-					</BlockContextProvider>
-				</div>
+						<BlockContextProvider
+							value={ {
+								filterData: {
+									items: displayedOptions,
+									isLoading,
+								},
+							} }
+						>
+							{ children }
+						</BlockContextProvider>
+					</div>
+				</InitialDisabled>
 			</div>
 		</>
 	);
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/style.scss
index 05109040dcd..ff6a707758e 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/style.scss
+++ b/plugins/woocommerce-blocks/assets/js/blocks/product-filters/inner-blocks/rating-filter/style.scss
@@ -1,6 +1,4 @@
 .wp-block-woocommerce-product-filter-rating {
-	display: grid;
-
 	.wc-block-components-product-rating {
 		margin-bottom: 0;
 		display: flex;
diff --git a/plugins/woocommerce/changelog/fix-rating-filter-minor-issues b/plugins/woocommerce/changelog/fix-rating-filter-minor-issues
new file mode 100644
index 00000000000..a5afe34ba16
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-rating-filter-minor-issues
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Experimental: Rating filter: fix block focus and visibility
+
+