diff --git a/core/themes/olivero/css/components/fieldset.css b/core/themes/olivero/css/components/fieldset.css
index da549d2839c822422e820b37a78a0a5fe326d033..4e15db16c7f8fd45fc697690558d3e19a6d61e5f 100644
--- a/core/themes/olivero/css/components/fieldset.css
+++ b/core/themes/olivero/css/components/fieldset.css
@@ -126,12 +126,9 @@
 }
 
 .fieldset__wrapper {
-  padding: var(--sp);
-}
-
-.fieldset__legend--invisible ~ .fieldset__wrapper {
   margin-block-start: 0;
-  padding: 0;
+  padding-block: var(--sp);
+  padding-inline-start: var(--sp);
 }
 
 .fieldset--group .fieldset__legend--visible ~ .fieldset__wrapper {
diff --git a/core/themes/olivero/css/components/fieldset.pcss.css b/core/themes/olivero/css/components/fieldset.pcss.css
index 03cca0f8da67439c113dc14f4e61891aa4acd6d3..5a6535901439a5d36befac8ccd8990bb5691b11e 100644
--- a/core/themes/olivero/css/components/fieldset.pcss.css
+++ b/core/themes/olivero/css/components/fieldset.pcss.css
@@ -109,12 +109,9 @@
 }
 
 .fieldset__wrapper {
-  padding: var(--sp);
-}
-
-.fieldset__legend--invisible ~ .fieldset__wrapper {
   margin-block-start: 0;
-  padding: 0;
+  padding-block: var(--sp);
+  padding-inline-start: var(--sp);
 }
 
 .fieldset--group .fieldset__legend--visible ~ .fieldset__wrapper {