diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d7219df..60f4031 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "solutions.tretter.esunandroid"
         minSdk = 26
         targetSdk = 35
-        versionCode = 18
-        versionName = "18"
+        versionCode = 19
+        versionName = "19"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/solutions/tretter/esunandroid/AppUi.kt b/app/src/main/java/solutions/tretter/esunandroid/AppUi.kt
index 0c17860..af82915 100644
--- a/app/src/main/java/solutions/tretter/esunandroid/AppUi.kt
+++ b/app/src/main/java/solutions/tretter/esunandroid/AppUi.kt
@@ -152,7 +152,9 @@ fun ESunApp(vm: MainViewModel) {
             valueLabel = { v -> "${((v / 100).toInt() * 100)}K" },
             onDismiss = { editTemp = null },
             onSave = {
-                vm.updatePresetTemperature(idx, (it / 100).toInt() * 100)
+                val v = (it / 100).toInt() * 100
+                vm.updatePresetTemperature(idx, v)
+                vm.selectTemperature(v)
                 editTemp = null
             }
         )
@@ -165,6 +167,7 @@ fun ESunApp(vm: MainViewModel) {
             onDismiss = { editTimer = null },
             onSave = {
                 vm.updatePresetTimer(idx, it)
+                vm.selectTimer(it)
                 editTimer = null
             }
         )
diff --git a/app/src/main/java/solutions/tretter/esunandroid/MainViewModel.kt b/app/src/main/java/solutions/tretter/esunandroid/MainViewModel.kt
index f12a932..d8e7164 100644
--- a/app/src/main/java/solutions/tretter/esunandroid/MainViewModel.kt
+++ b/app/src/main/java/solutions/tretter/esunandroid/MainViewModel.kt
@@ -50,7 +50,8 @@ class MainViewModel(private val prefs: AppPreferences) : ViewModel() {
     }
 
     fun updatePresetTimer(index: Int, value: Int) {
-        val v = value.coerceIn(1, 99 * 60)
+        // Max is 99:59
+        val v = value.coerceIn(1, (99 * 60) + 59)
         Log.i(tag, "updatePresetTimer index=$index value=$v")
         viewModelScope.launch { prefs.saveTimer(index, v) }
     }