diff --git a/.dev/assets/shared/css/blocks/group.css b/.dev/assets/shared/css/blocks/group.css
index 44640dc42..721215f35 100644
--- a/.dev/assets/shared/css/blocks/group.css
+++ b/.dev/assets/shared/css/blocks/group.css
@@ -2,15 +2,18 @@
 .wp-block-group {
 
 	&.has-background {
-		padding: var(--go--spacing--vertical) calc(var(--go--spacing--vertical) * 1.3);
 
-		@media (--medium) {
-			padding: calc(var(--go--spacing--vertical--lg) * 0.2) calc(var(--go--spacing--vertical--lg) * 0.25);
-		}
+		&:not([class*="padding"]) {
+			padding: var(--go--spacing--vertical) calc(var(--go--spacing--vertical) * 1.3);
 
-		&.alignwide,
-		&.alignfull {
-			padding: var(--go--spacing--vertical--lg);
+			@media (--medium) {
+				padding: calc(var(--go--spacing--vertical--lg) * 0.2) calc(var(--go--spacing--vertical--lg) * 0.25);
+			}
+
+			&.alignwide,
+			&.alignfull {
+				padding: var(--go--spacing--vertical--lg);
+			}
 		}
 
 		&.alignfull + .has-background.alignfull:not(.wp-block-gallery) {
diff --git a/.dev/assets/shared/css/editor/group.css b/.dev/assets/shared/css/editor/group.css
index 97283e7c2..3cf4906c0 100644
--- a/.dev/assets/shared/css/editor/group.css
+++ b/.dev/assets/shared/css/editor/group.css
@@ -2,7 +2,7 @@
 .wp-block[data-type="core/group"][data-align="wide"],
 .wp-block[data-type="core/group"][data-align="full"] {
 
-	& .wp-block-group.has-background {
+	& .wp-block-group.has-background:not([class*="padding"]) {
 		padding: var(--go--spacing--vertical--lg);
 	}
 }
@@ -10,7 +10,7 @@
 .wp-block[data-align="wide"],
 .wp-block[data-align="full"] {
 
-	& .wp-block-group.has-background {
+	& .wp-block-group.has-background:not([class*="padding"]) {
 		padding: var(--go--spacing--vertical--lg);
 	}
 }