diff --git a/packages/block-editor/src/components/block-list/style.scss b/packages/block-editor/src/components/block-list/style.scss
index 354167f81cc9a..be9b37b8c6ebd 100644
--- a/packages/block-editor/src/components/block-list/style.scss
+++ b/packages/block-editor/src/components/block-list/style.scss
@@ -550,6 +550,12 @@
 			&.is-down-button svg {
 				margin-bottom: 3px;
 			}
+
+			&:focus::before {
+				left: 0 !important;
+				min-width: 0;
+				width: 100%;
+			}
 		}
 	}
 }
diff --git a/packages/block-editor/src/components/block-mover/style.scss b/packages/block-editor/src/components/block-mover/style.scss
index cd575144d7958..65670ff655292 100644
--- a/packages/block-editor/src/components/block-mover/style.scss
+++ b/packages/block-editor/src/components/block-mover/style.scss
@@ -32,8 +32,8 @@
 		// Focus style.
 		// Overrides .components-toolbar-group styles
 		&::before {
-			left: $grid-unit-10 !important;
-			right: $grid-unit-10 !important;
+			left: 0 !important;
+			right: 0 !important;
 		}
 	}
 
@@ -47,7 +47,7 @@
 		// Focus style.
 		&::before {
 			bottom: 0;
-			height: calc(100% - #{ $grid-unit-10 });
+			height: calc(100% - #{ $border-width });
 		}
 	}
 
@@ -60,7 +60,7 @@
 		// Focus style.
 		&::before {
 			top: 0;
-			height: calc(100% - #{ $grid-unit-10 });
+			height: calc(100% - #{ $border-width });
 		}
 	}
 
@@ -76,8 +76,8 @@
 
 			// Focus style.
 			&::before {
-				top: $grid-unit-10;
-				bottom: $grid-unit-10;
+				top: 0;
+				bottom: 0;
 				min-width: 0;
 				width: auto;
 				height: auto;
@@ -95,7 +95,7 @@
 			// Focus style.
 			// Overrides .components-toolbar-group styles
 			&::before {
-				left: $grid-unit-10 !important;
+				left: 0 !important;
 				right: 0 !important;
 			}
 		}
@@ -111,7 +111,8 @@
 			// Overrides .components-toolbar-group styles
 			&::before {
 				left: 0 !important;
-				right: $grid-unit-10 !important;
+				right: 0 !important;
+				width: calc(100% + #{ $border-width });
 			}
 		}
 	}