diff --git a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
index 8c11ece9d..23af7008a 100644
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
 //import DatePicker from "react-datepicker";
 //import "react-datepicker/src/stylesheets/datepicker.scss";
-import { TimePicker } from "antd";
+import { Space, TimePicker } from "antd";
 import dayjs from "../../utils/day";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //To be used as a form element only.
@@ -14,7 +14,7 @@ const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, ...restProps
   // };
 
   return (
-    <div id={id}>
+    <Space direction="vertical" style={{ width: "100%" }} id={id}>
       <FormDatePicker
         {...restProps}
         {...(onlyFuture && {
@@ -39,7 +39,7 @@ const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, ...restProps
         format="hh:mm a"
         {...restProps}
       />
-    </div>
+    </Space>
   );
 };
 
diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
index f6214e2f7..ab5d69d3a 100644
--- a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
@@ -1,4 +1,4 @@
-import { Col, Form, Input, Row, Select, Switch } from "antd";
+import { Col, DatePicker, Form, Input, Row, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { FormDatePicker } from "../form-date-picker/form-date-picker.component.jsx";
@@ -30,7 +30,6 @@ export function TaskUpsertModalComponent({
   error
 }) {
   const { t } = useTranslation();
-
   const datePickerPresets = [
     { label: t("tasks.date_presets.today"), value: dayjs() },
     { label: t("tasks.date_presets.tomorrow"), value: dayjs().add(1, "day") },
@@ -202,7 +201,7 @@ export function TaskUpsertModalComponent({
         </Col>
         <Col span={8}>
           <Form.Item label={t("tasks.fields.remind_at")} name="remind_at">
-            <FormDatePicker format="MM/DD/YYYY" presets={datePickerPresets} />
+            <DatePicker showTime minuteStep={15} format="MM/DD/YYYY h:mm a" presets={datePickerPresets} />
           </Form.Item>
         </Col>
       </Row>