diff --git a/backend/controllers/edit_task.go b/backend/controllers/edit_task.go
index 48e8becd..c60b61d2 100644
--- a/backend/controllers/edit_task.go
+++ b/backend/controllers/edit_task.go
@@ -79,6 +79,12 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		end, err = utils.ConvertISOToTaskwarriorFormat(end)
+		if err != nil {
+			http.Error(w, fmt.Sprintf("Invalid end 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 38de644e..9f922248 100644
--- a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
@@ -432,7 +432,7 @@ export const TaskDialog = ({
                   <TableCell>
                     {editState.isEditingEndDate ? (
                       <div className="flex items-center gap-2">
-                        <DatePicker
+                        <DateTimePicker
                           date={
                             editState.editedEndDate &&
                             editState.editedEndDate !== ''
@@ -440,11 +440,9 @@ export const TaskDialog = ({
                                   try {
                                     const dateStr =
                                       editState.editedEndDate.includes('T')
-                                        ? editState.editedEndDate.split('T')[0]
-                                        : editState.editedEndDate;
-                                    const parsed = new Date(
-                                      dateStr + 'T00:00:00'
-                                    );
+                                        ? editState.editedEndDate
+                                        : editState.editedEndDate + 'T00:00:00';
+                                    const parsed = new Date(dateStr);
                                     return isNaN(parsed.getTime())
                                       ? undefined
                                       : parsed;
@@ -454,14 +452,16 @@ export const TaskDialog = ({
                                 })()
                               : undefined
                           }
-                          onDateChange={(date) =>
+                          onDateTimeChange={(date, hasTime) =>
                             onUpdateState({
                               editedEndDate: date
-                                ? format(date, 'yyyy-MM-dd')
+                                ? hasTime
+                                  ? date.toISOString()
+                                  : format(date, 'yyyy-MM-dd')
                                 : '',
                             })
                           }
-                          placeholder="Select end date"
+                          placeholder="Select end date and time"
                         />
                         <Button
                           variant="ghost"
@@ -498,11 +498,7 @@ export const TaskDialog = ({
                           onClick={() => {
                             onUpdateState({
                               isEditingEndDate: true,
-                              editedEndDate: task.end
-                                ? task.end.includes('T')
-                                  ? task.end.split('T')[0]
-                                  : task.end
-                                : '',
+                              editedEndDate: task.end || '',
                             });
                           }}
                         >
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
index e9b39c2a..d296f942 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
@@ -1103,7 +1103,7 @@ describe('Tasks Component', () => {
 
   test.each([
     ['Wait', 'Wait:', 'Pick a date'],
-    ['End', 'End:', 'Select end date'],
+    ['End', 'End:', 'Select end date and time'],
     ['Due', 'Due:', 'Select due date and time'],
     ['Start', 'Start:', 'Select start date and time'],
     ['Entry', 'Entry:', 'Pick a date'],