diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index eff8b99edc4..592b94a33ac 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -32,6 +32,7 @@ export default Component.extend({
 
     onChangeDate(date) {
       if (this.onChange) {
+        date = new Date(this.date);
         const year = date.getFullYear();
         const month = date.getMonth();
         const day = date.getDate();
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index 583039a0017..7917f408d03 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -1,4 +1,7 @@
 .d-date-input {
+  display: flex;
+  flex: 1;
+
   .date-picker {
     margin: 0;
     text-align: left;
diff --git a/app/assets/stylesheets/common/components/date-time-input.scss b/app/assets/stylesheets/common/components/date-time-input.scss
index 634bc219610..1ebe50f9f95 100644
--- a/app/assets/stylesheets/common/components/date-time-input.scss
+++ b/app/assets/stylesheets/common/components/date-time-input.scss
@@ -2,14 +2,16 @@
   display: flex;
   align-items: center;
   border: 1px solid $primary-low;
-  width: 258px;
   box-sizing: border-box;
   position: relative;
   flex: 1;
-  justify-content: space-between;
 
   .date-picker,
   .fields {
     border: 0;
   }
+
+  .d-date-time-input {
+    margin-left: auto;
+  }
 }