diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
index 7bf6cbd..a42125d 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
@@ -125,7 +125,11 @@ class ChooseParamsActivity : NoOptionsActivity() {
         endMinPicker?.setOnKeyListener { _, keyCode, event ->
             if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
                 if (event.action == KeyEvent.ACTION_DOWN) {
-                    mBinding.rbS30.requestFocus()
+                    if (mBinding.timeStepContainer.visibility == View.VISIBLE) {
+                        mBinding.rbS30.requestFocus()
+                    } else {
+                        mBinding.tvConfirm.requestFocus()
+                    }
                     return@setOnKeyListener true
                 }
             }