diff --git a/lib/ui/task/edit/task_edit_times.dart b/lib/ui/task/edit/task_edit_times.dart
index 41ee3d3e1..18bfc14e3 100644
--- a/lib/ui/task/edit/task_edit_times.dart
+++ b/lib/ui/task/edit/task_edit_times.dart
@@ -48,7 +48,7 @@ class _TaskEditTimesState extends State<TaskEditTimes> {
     final viewModel = widget.viewModel;
     final task = viewModel.task;
     final taskTime = viewModel.taskTimeIndex != null &&
-        task.taskTimes.length > viewModel.taskTimeIndex
+            task.taskTimes.length > viewModel.taskTimeIndex
         ? task.taskTimes[viewModel.taskTimeIndex]
         : null;
 
@@ -66,12 +66,11 @@ class _TaskEditTimesState extends State<TaskEditTimes> {
     final taskTimes = task.taskTimes
         .toList()
         .reversed
-        .map<Widget>((taskTime) =>
-        TaskTimeListTile(
-          task: task,
-          taskTime: taskTime,
-          onTap: (context) => _showTaskTimeEditor(taskTime, context),
-        ));
+        .map<Widget>((taskTime) => TaskTimeListTile(
+              task: task,
+              taskTime: taskTime,
+              onTap: (context) => _showTaskTimeEditor(taskTime, context),
+            ));
 
     return ListView(
       children: taskTimes.toList(),
@@ -134,6 +133,21 @@ class TimeEditDetailsState extends State<TimeEditDetails> {
               onSelected: (date) {
                 setState(() {
                   _date = date;
+                  final dateTime = DateTime.parse(_date);
+                  _startDate = DateTime(
+                      dateTime.year,
+                      dateTime.month,
+                      dateTime.day,
+                      _startDate.hour,
+                      _startDate.minute,
+                      _startDate.second);
+                  _endDate = DateTime(
+                      dateTime.year,
+                      dateTime.month,
+                      dateTime.day,
+                      _endDate.hour,
+                      _endDate.minute,
+                      _endDate.second);
                 });
               },
             ),
@@ -201,17 +215,22 @@ class TimeEditDetailsState extends State<TimeEditDetails> {
 
             final taskTime = TaskTime(
               startDate: DateTime(
-                  _startDate.year,
-                  _startDate.month,
-                  _startDate.day,
-                  _startDate.hour,
-                  _startDate.minute,
-                  _startDate.second)
+                      _startDate.year,
+                      _startDate.month,
+                      _startDate.day,
+                      _startDate.hour,
+                      _startDate.minute,
+                      _startDate.second)
                   .toUtc(),
               endDate: _endDate != null
-                  ? DateTime(_endDate.year, _endDate.month, _endDate.day,
-                _endDate.hour, _endDate.minute, _endDate.second,)
-                  .toUtc()
+                  ? DateTime(
+                      _endDate.year,
+                      _endDate.month,
+                      _endDate.day,
+                      _endDate.hour,
+                      _endDate.minute,
+                      _endDate.second,
+                    ).toUtc()
                   : null,
             );
             widget.viewModel.onDoneTaskTimePressed(taskTime, widget.index);