diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt
index c4cf6e471..6c68330a0 100644
--- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt
+++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt
@@ -166,6 +166,18 @@ private fun <T> WheelPicker(
                             showManualInput = false
                         }
                     },
+                onKeyboardAction = {
+                    scope.launch {
+                        items
+                            .indexOfFirst { it.toString() == value.text }
+                            .takeIf { it >= 0 }
+                            ?.apply {
+                                internalOnSelectionChanged(this)
+                                lazyListState.scrollToItem(this)
+                            }
+                        showManualInput = false
+                    }
+                },
                 state = value,
                 lineLimits = TextFieldLineLimits.SingleLine,
                 keyboardOptions = KeyboardOptions(