diff --git a/backend/controllers/edit_task.go b/backend/controllers/edit_task.go
index 8ac93147..48e8becd 100644
--- a/backend/controllers/edit_task.go
+++ b/backend/controllers/edit_task.go
@@ -73,6 +73,12 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		due, err = utils.ConvertISOToTaskwarriorFormat(due)
+		if err != nil {
+			http.Error(w, fmt.Sprintf("Invalid due date format: %v", err), http.StatusBadRequest)
+			return
+		}
+
 		logStore := models.GetLogStore()
 		job := Job{
 			Name: "Edit Task",
diff --git a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
index c3be7de3..38de644e 100644
--- a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
@@ -266,7 +266,7 @@ export const TaskDialog = ({
                   <TableCell>
                     {editState.isEditingDueDate ? (
                       <div className="flex items-center gap-2">
-                        <DatePicker
+                        <DateTimePicker
                           date={
                             editState.editedDueDate &&
                             editState.editedDueDate !== ''
@@ -274,11 +274,9 @@ export const TaskDialog = ({
                                   try {
                                     const dateStr =
                                       editState.editedDueDate.includes('T')
-                                        ? editState.editedDueDate.split('T')[0]
-                                        : editState.editedDueDate;
-                                    const parsed = new Date(
-                                      dateStr + 'T00:00:00'
-                                    );
+                                        ? editState.editedDueDate
+                                        : editState.editedDueDate + 'T00:00:00';
+                                    const parsed = new Date(dateStr);
                                     return isNaN(parsed.getTime())
                                       ? undefined
                                       : parsed;
@@ -288,14 +286,16 @@ export const TaskDialog = ({
                                 })()
                               : undefined
                           }
-                          onDateChange={(date) =>
+                          onDateTimeChange={(date, hasTime) =>
                             onUpdateState({
                               editedDueDate: date
-                                ? format(date, 'yyyy-MM-dd')
+                                ? hasTime
+                                  ? date.toISOString()
+                                  : format(date, 'yyyy-MM-dd')
                                 : '',
                             })
                           }
-                          placeholder="Select due date"
+                          placeholder="Select due date and time"
                         />
                         <Button
                           variant="ghost"
@@ -332,11 +332,7 @@ export const TaskDialog = ({
                           onClick={() => {
                             onUpdateState({
                               isEditingDueDate: true,
-                              editedDueDate: task.due
-                                ? task.due.includes('T')
-                                  ? task.due.split('T')[0]
-                                  : task.due
-                                : '',
+                              editedDueDate: task.due || '',
                             });
                           }}
                         >
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
index fd72286d..e9b39c2a 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
@@ -1104,7 +1104,7 @@ describe('Tasks Component', () => {
   test.each([
     ['Wait', 'Wait:', 'Pick a date'],
     ['End', 'End:', 'Select end date'],
-    ['Due', 'Due:', 'Select due date'],
+    ['Due', 'Due:', 'Select due date and time'],
     ['Start', 'Start:', 'Select start date and time'],
     ['Entry', 'Entry:', 'Pick a date'],
   ])('shows red when task %s date is edited', async (_, label, placeholder) => {