diff --git a/packages/edit-site/src/components/site-icon/style.scss b/packages/edit-site/src/components/site-icon/style.scss
index 3d396dcbf6f896..32b0675b78be2f 100644
--- a/packages/edit-site/src/components/site-icon/style.scss
+++ b/packages/edit-site/src/components/site-icon/style.scss
@@ -22,10 +22,7 @@
 
 }
 
-/* Apply focus border to both the site icon and image when the button is focused */
-button:focus {
-	.edit-site-site-icon__icon,
-	.edit-site-site-icon__image {
-		border: var(--wp-admin-border-width-focus) solid var(--wp-admin-theme-color);
-	}
+.edit-site-editor__view-mode-toggle button:focus {
+	box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color) !important;
+	padding: 1px;
 }