diff --git a/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss b/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss
index 829be1977..f65c5c9d5 100644
--- a/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss
+++ b/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss
@@ -88,7 +88,7 @@
 		margin-left: 5px;
 	}
 
-	+ .ppcp-r-settings-block {
+	+ .ppcp-r-settings-block:not(.no-gap) {
 		margin-top: 32px;
 		padding-top: 32px;
 		border-top: 1px solid var(--color-gray-200);
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/SettingsBlock.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/SettingsBlock.js
index 2ded62c11..e033a69df 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/SettingsBlock.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/SettingsBlock.js
@@ -1,7 +1,9 @@
 import classNames from 'classnames';
 
-const SettingsBlock = ( { className, children } ) => {
-	const blockClassName = classNames( 'ppcp-r-settings-block', className );
+const SettingsBlock = ( { className, children, separatorAndGap = true } ) => {
+	const blockClassName = classNames( 'ppcp-r-settings-block', className, {
+		'no-gap': ! separatorAndGap,
+	} );
 
 	return <div className={ blockClassName }>{ children }</div>;
 };