diff --git a/core/themes/claro/css/src/components/form.css b/core/themes/claro/css/src/components/form.css
index a1d8f5a119..85aa943c78 100644
--- a/core/themes/claro/css/src/components/form.css
+++ b/core/themes/claro/css/src/components/form.css
@@ -91,6 +91,7 @@
 .form-item {
   margin-top: 1.5rem;
   margin-bottom: 1.5rem;
+  max-width: 100%;
 }
 
 /**
diff --git a/core/themes/claro/css/src/components/form.pcss.css b/core/themes/claro/css/src/components/form.pcss.css
index 6c2837b90e..5ba2fa17bf 100644
--- a/core/themes/claro/css/src/components/form.pcss.css
+++ b/core/themes/claro/css/src/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