diff --git a/app/src/main/res/layout/player_prioritize_item.xml b/app/src/main/res/layout/player_prioritize_item.xml
index b78863f8..a8a9729d 100644
--- a/app/src/main/res/layout/player_prioritize_item.xml
+++ b/app/src/main/res/layout/player_prioritize_item.xml
@@ -22,6 +22,7 @@
         android:layout_toStartOf="@id/priority_number"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
+        android:focusable="true"
         android:src="@drawable/baseline_remove_24" />
 
     <TextView
@@ -43,6 +44,7 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
+        android:focusable="true"
         android:src="@drawable/ic_baseline_add_24" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/player_select_source_priority.xml b/app/src/main/res/layout/player_select_source_priority.xml
index 86a8a756..2af3c339 100644
--- a/app/src/main/res/layout/player_select_source_priority.xml
+++ b/app/src/main/res/layout/player_select_source_priority.xml
@@ -42,8 +42,8 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_less"
-                android:nextFocusLeft="@id/sort_subtitles"
-                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusRight="@id/sort_subtitles"
+                android:nextFocusDown="@id/profile_text_editable"
                 android:requiresFadingEdge="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:layout_height="100dp"
@@ -92,6 +92,8 @@
                         android:layout_height="50dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="12dp"
+                        android:focusable="true"
+                        android:nextFocusLeft="@id/sort_sources"
                         android:src="@drawable/baseline_help_outline_24"
                         android:contentDescription="@string/help" />
 
@@ -115,8 +117,10 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_less"
-                android:nextFocusLeft="@id/sort_providers"
-                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusLeft="@id/sort_sources"
+                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusUp="@id/help_btt"
+                android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:layout_height="200dp"