diff --git a/lib/form/templates/element-date_selector.mustache b/lib/form/templates/element-date_selector.mustache
index c406d911920d3..53a8bbc38969d 100644
--- a/lib/form/templates/element-date_selector.mustache
+++ b/lib/form/templates/element-date_selector.mustache
@@ -2,7 +2,7 @@
     {{$element}}
         <fieldset data-fieldtype="date" class="m-0 p-0 border-0" id="{{element.id}}">
             <legend class="sr-only">{{label}}</legend>
-            <span class="fdate_selector d-flex align-items-center">
+            <span class="fdate_selector d-flex flex-wrap align-items-center">
             {{#element.elements}}
                 {{{separator}}}
                 {{{html}}}