diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index a50ea83f4c1..dae6737e1ae 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -425,24 +425,42 @@
   }
 }
 
+.modal .modal-body.change-timestamp {
+  overflow-y: scroll;
+
+  form {
+    display: flex;
+
+    input.date-picker,
+    input[type="time"] {
+      margin: 0;
+    }
+  }
+}
+
 .change-timestamp,
 .poll-ui-builder {
   max-width: 420px;
-  .date-picker {
-    min-width: 8em;
-  }
 
   #date-container {
     .pika-single {
       position: relative !important; // overriding another important
       display: inline-block;
-      margin-top: 5px;
+      margin-top: 0.5em;
+    }
+  }
+
+  .date-picker-wrapper {
+    min-width: 130px;
+    margin-right: 0.5em;
+
+    .date-picker {
+      height: 100%;
     }
   }
 
   input[type="time"] {
-    width: 7em;
-    text-align: center;
+    width: 130px;
   }
 
   form {