diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index 8f90c5aa7..7297e1ab3 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -21,6 +21,7 @@
             android:inputType="textCapCharacters|textAutoCorrect|textAutoComplete"
             android:letterSpacing="0.02"
             android:maxLength="50"
+            android:nextFocusDown="@id/word"
             android:paddingStart="24dp"
             android:paddingTop="24dp"
             android:paddingEnd="24dp"
@@ -52,6 +53,8 @@
             android:layout_toEndOf="@+id/word"
             android:clipChildren="false"
             android:clipToPadding="false"
+            android:nextFocusLeft="@id/word"
+            android:nextFocusUp="@id/keyword"
             android:padding="12dp"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             app:spanCount="10"