diff --git a/mobile/src/main/res/layout/listitem_repeater.xml b/mobile/src/main/res/layout/listitem_repeater.xml
index 2711ac80..23415861 100644
--- a/mobile/src/main/res/layout/listitem_repeater.xml
+++ b/mobile/src/main/res/layout/listitem_repeater.xml
@@ -70,6 +70,7 @@
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackground"
             android:focusable="true"
+            android:nextFocusDown="@+id/oc"
             android:padding="16dp"
             android:onClick="@{_ -> data.editConfigurations()}">
 
@@ -113,8 +114,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
             android:padding="16dp">
 
             <Space
@@ -145,6 +144,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
 
                 <EditText
+                    android:id="@+id/oc"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@={data.oc}"
@@ -161,6 +161,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:focusable="true"
+            android:nextFocusUp="@+id/oc"
             android:background="?android:attr/selectableItemBackground"
             android:padding="16dp"
             android:onClick="@{_ -> data.wps()}"