diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimeDialogFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt
similarity index 89%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimeDialogFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt
index 4bd4c822..b4c7326c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimeDialogFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt
@@ -13,11 +13,10 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener,
 	TimePickerDialog.OnTimeSetListener {
 
 	private var context: Context? = null
-	private val calendar = Calendar.getInstance()
 
 	lateinit var row: DynamicRowInterface
 	lateinit var bottomSheetDelegate: BottomSheetDelegate
-
+	lateinit var calendar: Calendar
 
 	companion object {
 		fun create(
@@ -26,11 +25,18 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener,
 			bottomSheetDelegate: BottomSheetDelegate,
 			date: Date?
 		) : DateTimePickerManager {
+
+			val calendar = Calendar.getInstance()
+			calendar.time = date ?: Date()
+
 			val dateTimePickerManager = DateTimePickerManager()
 			dateTimePickerManager.context = context
-			dateTimePickerManager.showDatePicker()
 			dateTimePickerManager.row = row
 			dateTimePickerManager.bottomSheetDelegate = bottomSheetDelegate
+			dateTimePickerManager.calendar = calendar
+
+			dateTimePickerManager.showDatePicker()
+
 			return dateTimePickerManager
 		}
 	}
@@ -66,8 +72,8 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener,
 	 * Show the time picker
 	 */
 	private fun showTimePicker() {
-		val hour = calendar.get(Calendar.YEAR)
-		val minute = calendar.get(Calendar.MONTH)
+		val hour = calendar.get(Calendar.HOUR_OF_DAY)
+		val minute = calendar.get(Calendar.MINUTE)
 		context?.let {
 			val timePickerDialog = TimePickerDialog(context, this, hour, minute, DateFormat.is24HourFormat(context))
 			timePickerDialog.show()