diff --git a/app/src/main/res/layout/fragment_setup_extensions.xml b/app/src/main/res/layout/fragment_setup_extensions.xml
index e5288504695..151c9e0ece2 100644
--- a/app/src/main/res/layout/fragment_setup_extensions.xml
+++ b/app/src/main/res/layout/fragment_setup_extensions.xml
@@ -55,6 +55,8 @@
         android:id="@+id/repo_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:nextFocusLeft="@id/prev_btt"
+        android:nextFocusRight="@id/next_btt"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/repository_item"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_setup_language.xml b/app/src/main/res/layout/fragment_setup_language.xml
index 93afe823ed5..bdba3f20976 100644
--- a/app/src/main/res/layout/fragment_setup_language.xml
+++ b/app/src/main/res/layout/fragment_setup_language.xml
@@ -31,6 +31,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
+        android:nextFocusLeft="@id/skip_btt"
+        android:nextFocusRight="@id/next_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_setup_layout.xml b/app/src/main/res/layout/fragment_setup_layout.xml
index 18815ced353..9e891e1aa6a 100644
--- a/app/src/main/res/layout/fragment_setup_layout.xml
+++ b/app/src/main/res/layout/fragment_setup_layout.xml
@@ -29,8 +29,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/apply_btt"
-        android:nextFocusRight="@id/cancel_btt"
+        android:nextFocusLeft="@id/prev_btt"
+        android:nextFocusRight="@id/next_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_setup_media.xml b/app/src/main/res/layout/fragment_setup_media.xml
index 154db33869e..c1154405eb6 100644
--- a/app/src/main/res/layout/fragment_setup_media.xml
+++ b/app/src/main/res/layout/fragment_setup_media.xml
@@ -26,8 +26,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/apply_btt"
-        android:nextFocusRight="@id/cancel_btt"
+        android:nextFocusLeft="@id/prev_btt"
+        android:nextFocusRight="@id/next_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_setup_provider_languages.xml b/app/src/main/res/layout/fragment_setup_provider_languages.xml
index 8dc889178ac..e92f1135bfc 100644
--- a/app/src/main/res/layout/fragment_setup_provider_languages.xml
+++ b/app/src/main/res/layout/fragment_setup_provider_languages.xml
@@ -29,8 +29,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/apply_btt"
-        android:nextFocusRight="@id/cancel_btt"
+        android:nextFocusLeft="@id/prev_btt"
+        android:nextFocusRight="@id/next_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />