diff --git a/app/assets/javascripts/app/views/generic/date.jst.eco b/app/assets/javascripts/app/views/generic/date.jst.eco
index 1f2c7f2bf..5e27f401d 100644
--- a/app/assets/javascripts/app/views/generic/date.jst.eco
+++ b/app/assets/javascripts/app/views/generic/date.jst.eco
@@ -1,4 +1,4 @@
-<div class="" data-name="<%= @attribute.nameRaw %>">
+<div class="u-positionOrigin" data-name="<%= @attribute.nameRaw %>">
   <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
   <input type="text" value="" class="form-control js-datepicker" data-item="date">
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/datetime.jst.eco b/app/assets/javascripts/app/views/generic/datetime.jst.eco
index 2f62c75a7..8d59b80ad 100644
--- a/app/assets/javascripts/app/views/generic/datetime.jst.eco
+++ b/app/assets/javascripts/app/views/generic/datetime.jst.eco
@@ -1,4 +1,4 @@
-<div class="controls--bundle" data-name="<%= @attribute.nameRaw %>">
+<div class="controls--bundle u-positionOrigin" data-name="<%= @attribute.nameRaw %>">
   <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
   <input type="text" value="" class="form-control js-datepicker" data-item="date">
   <div class="controls-label"><%- @T('at') %></div>