diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt
index 74466993..1ccefd77 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt
@@ -7,7 +7,7 @@ import com.simplemobiletools.clock.extensions.config
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import kotlinx.android.synthetic.main.dialog_my_time_picker.view.*
 
-class MyTimePickerDialogDialog(val activity: SimpleActivity, val initialSeconds: Int, private val callback: () -> Unit) {
+class MyTimePickerDialogDialog(val activity: SimpleActivity, val initialSeconds: Int, val callback: (result: Int) -> Unit) {
     private var view = activity.layoutInflater.inflate(R.layout.dialog_my_time_picker, null)
 
     init {
@@ -18,6 +18,10 @@ class MyTimePickerDialogDialog(val activity: SimpleActivity, val initialSeconds:
                 it.selectedTextColor = textColor
                 it.dividerColor = textColor
             }
+
+            my_time_picker_hours.value = initialSeconds / 3600
+            my_time_picker_minutes.value = (initialSeconds) / 60 % 60
+            my_time_picker_seconds.value = initialSeconds % 60
         }
 
         AlertDialog.Builder(activity)
@@ -29,6 +33,11 @@ class MyTimePickerDialogDialog(val activity: SimpleActivity, val initialSeconds:
     }
 
     private fun dialogConfirmed() {
-        callback()
+        view.apply {
+            val hours = my_time_picker_hours.value
+            val minutes = my_time_picker_minutes.value
+            val seconds = my_time_picker_seconds.value
+            callback(hours * 3600 + minutes * 60 + seconds)
+        }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
index aded815e..2dbfe1ce 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
@@ -84,7 +84,11 @@ class TimerFragment : Fragment() {
             timer_initial_time.colorLeftDrawable(textColor)
             timer_initial_time.setOnClickListener {
                 MyTimePickerDialogDialog(activity as SimpleActivity, config.timerSeconds) {
-
+                    config.timerSeconds = it
+                    timer_initial_time.text = it.getFormattedDuration()
+                    if (!isRunning) {
+                        resetTimer()
+                    }
                 }
             }