diff --git a/edit-post/components/header/header-toolbar/style.scss b/edit-post/components/header/header-toolbar/style.scss
index 2d2a0869b421a..d2ed697825194 100644
--- a/edit-post/components/header/header-toolbar/style.scss
+++ b/edit-post/components/header/header-toolbar/style.scss
@@ -23,14 +23,9 @@
 	min-height: $block-toolbar-height;
 	border-bottom: $border-width solid $light-gray-500;
 
-	.editor-block-toolbar {
-		margin: -9px 0;
-	}
-
 	.editor-block-toolbar .components-toolbar {
 		border-top: none;
 		border-bottom: none;
-		padding: 9px;
 	}
 
 	.is-sidebar-opened & {
@@ -57,6 +52,14 @@
 		.is-sidebar-opened & {
 			right: auto;
 		}
+
+		.editor-block-toolbar {
+			margin: -9px 0;
+		}
+
+		.editor-block-toolbar .components-toolbar {
+			padding: 9px;
+		}
 	}
 }