diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index a933522a98..3a9cceaf9e 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -78,6 +78,8 @@
 .form-item {
   margin-top: 1.5rem;
   margin-bottom: 1.5rem;
+  max-width: 100%;
+  -ms-flex: 0 0 auto;
 }
 
 /**
diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
index 390944840d..c63b5b05be 100644
--- a/core/themes/claro/css/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -19,6 +19,8 @@
 .form-item {
   margin-top: var(--space-l);
   margin-bottom: var(--space-l);
+  max-width: 100%;
+  -ms-flex: 0 0 auto;
 }
 /**
  * When a table row or a container-inline has a single form item, prevent it