diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index 9632d1e6..3266c184 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -25,6 +25,8 @@
  */
 
 .form-item {
+  -ms-flex: 0 0 auto;
+  max-width: 100%;
   margin-top: var(--space-l);
   margin-bottom: var(--space-l);
 }
diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
index a8cf852c..0fc9467e 100644
--- a/core/themes/claro/css/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -15,6 +15,8 @@
  * General form item.
  */
 .form-item {
+  -ms-flex: 0 0 auto;
+  max-width: 100%;
   margin-top: var(--space-l);
   margin-bottom: var(--space-l);
 }