diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index af55c44d2509d4..26f468c8458931 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -93,7 +93,6 @@
 	padding: 0;
 
 	.components-menu-group {
-		padding: $grid-unit-20;
 		margin: 0;
 	}
 }
@@ -187,18 +186,19 @@
 .block-editor-block-switcher__preview-patterns-container {
 	.block-editor-block-switcher__preview-patterns-container-list__list-item {
 		margin-top: $grid-unit-20;
+
 		.block-editor-block-preview__container {
 			cursor: pointer;
 		}
+
 		.block-editor-block-switcher__preview-patterns-container-list__item {
 			height: 100%;
 			border-radius: $radius-block-ui;
 			transition: all 0.05s ease-in-out;
 			position: relative;
 			border: $border-width solid transparent;
-			&:hover {
-				border: $border-width solid var(--wp-admin-theme-color);
-			}
+
+			&:hover,
 			&:focus {
 				box-shadow: inset 0 0 0 1px $white, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 
@@ -206,6 +206,10 @@
 				outline: 2px solid transparent;
 			}
 
+			&:hover {
+				box-shadow: inset 0 0 0 1px $white, 0 0 0 var(--wp-admin-border-width-focus) $gray-900;
+			}
+
 			.block-editor-block-switcher__preview-patterns-container-list__item-title {
 				padding: $grid-unit-05;
 				font-size: 12px;