diff --git a/vector/src/main/res/drawable/bg_login_server_selector.xml b/vector/src/main/res/drawable/bg_login_server_selector.xml
index 3fcc4e006a..f9733bb5d2 100644
--- a/vector/src/main/res/drawable/bg_login_server_selector.xml
+++ b/vector/src/main/res/drawable/bg_login_server_selector.xml
@@ -2,8 +2,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:drawable="@drawable/bg_login_server_checked" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_login_server_checked" android:state_focused="true" />
     <item android:drawable="@drawable/bg_login_server_checked" android:state_pressed="true" />
 
     <item android:drawable="@drawable/bg_login_server" />
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 1e25c63b4a..910643ba78 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -52,6 +52,8 @@
                 android:layout_marginTop="24dp"
                 android:background="@drawable/bg_login_server_selector"
                 android:contentDescription="@string/login_a11y_connect_using_matrix_id_sc"
+                android:clickable="true"
+                android:focusable="true"
                 android:minHeight="80dp"
                 android:paddingStart="@dimen/layout_horizontal_margin"
                 android:paddingEnd="@dimen/layout_horizontal_margin"
@@ -95,6 +97,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:background="@drawable/bg_login_server_selector"
                 android:contentDescription="@string/login_a11y_choose_other_sc"
+                android:clickable="true"
+                android:focusable="true"
                 android:minHeight="80dp"
                 android:paddingStart="@dimen/layout_horizontal_margin"
                 android:paddingEnd="@dimen/layout_horizontal_margin"
@@ -138,6 +142,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:background="@drawable/bg_login_server_selector"
                 android:contentDescription="@string/login_a11y_choose_matrix_org"
+                android:clickable="true"
+                android:focusable="true"
                 android:minHeight="80dp"
                 android:paddingStart="@dimen/layout_horizontal_margin"
                 android:paddingEnd="@dimen/layout_horizontal_margin"