diff --git a/app/src/main/res/layout/add_repo_input.xml b/app/src/main/res/layout/add_repo_input.xml
index 6f6b4d5b..d6b977ba 100644
--- a/app/src/main/res/layout/add_repo_input.xml
+++ b/app/src/main/res/layout/add_repo_input.xml
@@ -70,9 +70,7 @@
             android:autofillHints="username"
             android:hint="@string/repository_name_hint"
             android:inputType="text"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusDown="@id/site_url_input"
+            android:nextFocusDown="@id/repo_url_input"
             android:requiresFadingEdge="vertical"
             android:textColorHint="?attr/grayTextColor"
             tools:ignore="LabelFor" />
@@ -83,11 +81,8 @@
             android:layout_height="wrap_content"
             android:hint="@string/repository_url_hint"
             android:inputType="textUri"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/site_name_input"
-            android:nextFocusDown="@id/site_lang_input"
+            android:nextFocusUp="@id/repo_name_input"
+            android:nextFocusDown="@id/apply_btt"
             android:requiresFadingEdge="vertical"
             android:textColorHint="?attr/grayTextColor"
             tools:ignore="LabelFor" />