diff --git a/edit-post/assets/stylesheets/_z-index.scss b/edit-post/assets/stylesheets/_z-index.scss
index 87d0bef53df7c..9a350e6868e7f 100644
--- a/edit-post/assets/stylesheets/_z-index.scss
+++ b/edit-post/assets/stylesheets/_z-index.scss
@@ -18,9 +18,9 @@ $z-layers: (
 	".edit-post-meta-boxes-area .spinner": 5,
 	".editor-block-contextual-toolbar": 21,
 	".components-popover__close": 5,
-	".editor-block-list__insertion-point": 5,
+	".editor-block-list__insertion-point": 6,
 	".editor-inserter-with-shortcuts": 5,
-	".editor-warning": 6,
+	".editor-warning": 5,
 	".block-library-gallery-item__inline-menu": 20,
 	".editor-url-input__suggestions": 30,
 	".edit-post-header": 30,
diff --git a/packages/editor/src/components/block-list/style.scss b/packages/editor/src/components/block-list/style.scss
index 2374128fc47d7..f8cdf053c685d 100644
--- a/packages/editor/src/components/block-list/style.scss
+++ b/packages/editor/src/components/block-list/style.scss
@@ -279,7 +279,7 @@
 
 .editor-block-list__layout .editor-block-list__block {
 	&.has-warning {
-		min-height: $block-padding + $block-spacing;
+		min-height: ( $block-padding + $block-spacing ) * 2;
 	}
 
 	// Warnings