diff --git a/app/src/leanback/res/layout/view_control_live.xml b/app/src/leanback/res/layout/view_control_live.xml
index 18951a078..3fc2b0f1f 100644
--- a/app/src/leanback/res/layout/view_control_live.xml
+++ b/app/src/leanback/res/layout/view_control_live.xml
@@ -45,6 +45,7 @@
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
+            android:nextFocusLeft="@id/across"
             android:textColor="@color/white"
             android:textSize="14sp"
             tools:text="EXO" />
@@ -177,6 +178,7 @@
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
+            android:nextFocusRight="@id/player"
             android:text="@string/play_across"
             android:textColor="@color/text"
             android:textSize="14sp" />
diff --git a/app/src/leanback/res/layout/view_control_vod.xml b/app/src/leanback/res/layout/view_control_vod.xml
index 95cad2d73..57175640b 100644
--- a/app/src/leanback/res/layout/view_control_vod.xml
+++ b/app/src/leanback/res/layout/view_control_vod.xml
@@ -42,7 +42,7 @@
                 android:background="@drawable/selector_text"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:nextFocusLeft="@id/next"
+                android:nextFocusLeft="@id/loop"
                 android:nextFocusDown="@id/timeBar"
                 android:text="@string/play_next"
                 android:textColor="@color/white"
@@ -221,7 +221,7 @@
                 android:background="@drawable/selector_text"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:nextFocusRight="@id/loop"
+                android:nextFocusRight="@id/next"
                 android:nextFocusDown="@id/timeBar"
                 android:text="@string/play_loop"
                 android:textColor="@color/text"