diff --git a/packages/components/src/base-control/style.scss b/packages/components/src/base-control/style.scss
index fe065ce93fac58..e3af118add5e16 100644
--- a/packages/components/src/base-control/style.scss
+++ b/packages/components/src/base-control/style.scss
@@ -18,6 +18,9 @@
 	.components-base-control__help {
 		margin-top: -$grid-size;
 		font-style: italic;
-		margin-bottom: 0;
 	}
 }
+
+.components-base-control + .components-base-control {
+	margin-bottom: $grid-size-large;
+}
diff --git a/packages/edit-post/src/components/sidebar/settings-sidebar/style.scss b/packages/edit-post/src/components/sidebar/settings-sidebar/style.scss
index 0640c4312e03c5..83749d10a4d61b 100644
--- a/packages/edit-post/src/components/sidebar/settings-sidebar/style.scss
+++ b/packages/edit-post/src/components/sidebar/settings-sidebar/style.scss
@@ -1,12 +1,13 @@
 .edit-post-settings-sidebar__panel-block .components-panel__body {
 	border: none;
 	border-top: $border-width solid $light-gray-500;
-	margin: 0 -16px;
+	margin: 0 #{ -$grid-size-large };
 
 	.components-base-control {
-		margin: 0 0 1.5em 0;
+		margin-bottom: #{ $grid-size * 3 };
+
 		&:last-child {
-			margin-bottom: 0.5em;
+			margin-bottom: $grid-size;
 		}
 	}
 
@@ -15,10 +16,10 @@
 	}
 
 	&:first-child {
-		margin-top: 16px;
+		margin-top: $grid-size-large;
 	}
 
 	&:last-child {
-		margin-bottom: -16px;
+		margin-bottom: -$grid-size-large;
 	}
 }