diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index c2ab325e92..da58b0085a 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -79,6 +79,7 @@
 .form-item {
   margin-top: 1.5rem;
   margin-bottom: 1.5rem;
+  max-width: 100%;
 }
 
 /**
diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
index a39ea94255..d77c8e698c 100644
--- a/core/themes/claro/css/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -19,6 +19,7 @@
 .form-item {
   margin-top: var(--space-l);
   margin-bottom: var(--space-l);
+  max-width: 100%;
 }
 /**
  * When a table row or a container-inline has a single form item, prevent it