diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/editor.scss b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/editor.scss
index 96ef2ec24e7..8fc4e5b4a0e 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/editor.scss
+++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/editor.scss
@@ -41,4 +41,16 @@
 		box-shadow: inset 0 0 0 1px;
 		color: inherit;
 	}
+
+	.wp-block-woocommerce-empty-mini-cart-contents-block {
+		overflow-y: unset;
+		padding: 0;
+
+		> .block-editor-inner-blocks {
+			max-height: 100vh;
+			overflow-y: auto;
+			box-sizing: border-box;
+			padding: $gap-largest $gap $gap;
+		}
+	}
 }
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/block.tsx b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/block.tsx
deleted file mode 100644
index 42665c5edeb..00000000000
--- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/block.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const Block = ( { children }: { children: JSX.Element } ): JSX.Element => {
-	return <>{ children }</>;
-};
-
-export default Block;
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/frontend.tsx b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/frontend.tsx
index ae685bbfdd7..5e69e36c119 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/frontend.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/frontend.tsx
@@ -20,7 +20,11 @@ const EmptyMiniCartContentsBlock = ( {
 		return null;
 	}
 
-	return <>{ children }</>;
+	return (
+		<div className="wp-block-woocommerce-empty-mini-cart-contents-block">
+			{ children }
+		</div>
+	);
 };
 
 export default EmptyMiniCartContentsBlock;
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart/style.scss
index 8aa1e8b1ad2..6729b131331 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart/style.scss
+++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/mini-cart/style.scss
@@ -65,6 +65,7 @@
 
 		button {
 			color: inherit;
+			z-index: 9999;
 		}
 
 		svg {
@@ -84,6 +85,11 @@
 	justify-content: center;
 }
 
+.wp-block-woocommerce-empty-mini-cart-contents-block {
+	overflow-y: auto;
+	padding: $gap-largest $gap $gap;
+}
+
 h2.wc-block-mini-cart__title {
 	@include font-size(larger);
 	margin: $gap-largest $gap 0;