Commit 641da8d

@@ -18,7 +18,7 @@ Future<DateTime?> showDateTimePicker({
 
   final TimeOfDay? selectedTime = await showTimePicker(
     context: context,
-    initialTime: TimeOfDay.fromDateTime(selectedDate),
+    initialTime: TimeOfDay.fromDateTime(initialDate),
   );
 
   return selectedTime == null

@@ -69,7 +69,8 @@ class _AddMeasurementPageState extends State<AddMeasurementPage> {
                           var selectedTime = await showDateTimePicker(
                               context: context,
                               firstDate: DateTime.fromMillisecondsSinceEpoch(0),
-                              lastDate: DateTime.now().copyWith(second: DateTime.now().second + 1));
+                              lastDate: DateTime.now().copyWith(second: DateTime.now().second + 1),
+                              initialDate: _time);
                           if (selectedTime != null) {
                             setState(() {
                               _time = selectedTime;