diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index 44655e7341..669a00f1af 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -29,6 +29,8 @@
  */
 
 .form-item {
+  -ms-flex: 0 0 auto;
+  max-width: 100%;
   margin-top: 1.5rem;
   margin-bottom: 1.5rem;
 }
diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
index 75f49c9437..050b9d3962 100644
--- a/core/themes/claro/css/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -17,6 +17,8 @@
  * General form item.
  */
 .form-item {
+  -ms-flex: 0 0 auto;
+  max-width: 100%;
   margin-top: var(--space-l);
   margin-bottom: var(--space-l);
 }