diff --git a/app/src/main/res/layout/account_managment.xml b/app/src/main/res/layout/account_managment.xml
index 389a3406..e7afb382 100644
--- a/app/src/main/res/layout/account_managment.xml
+++ b/app/src/main/res/layout/account_managment.xml
@@ -62,14 +62,16 @@
     </LinearLayout>
 
     <TextView
-            android:id="@+id/account_switch_account"
-            android:text="@string/switch_account"
-            style="@style/SettingsItem" />
+        android:id="@+id/account_switch_account"
+        android:text="@string/switch_account"
+        style="@style/SettingsItem"
+        android:focusable="true"/>
 
     <TextView
-            android:id="@+id/account_logout"
-            android:text="@string/logout"
-            style="@style/SettingsItem">
+        android:id="@+id/account_logout"
+        android:text="@string/logout"
+        style="@style/SettingsItem"
+        android:focusable="true">
 
         <requestFocus />
     </TextView>
diff --git a/app/src/main/res/layout/account_single.xml b/app/src/main/res/layout/account_single.xml
index cbfb9f18..c4f7fa39 100644
--- a/app/src/main/res/layout/account_single.xml
+++ b/app/src/main/res/layout/account_single.xml
@@ -1,10 +1,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:orientation="horizontal"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+    android:orientation="horizontal"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:focusable="true">
 
     <androidx.cardview.widget.CardView
             android:id="@+id/account_profile_picture_holder"
@@ -15,16 +16,16 @@
             android:layout_height="30dp">
 
         <ImageView
-                android:id="@+id/account_profile_picture"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:ignore="ContentDescription" />
+            android:id="@+id/account_profile_picture"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:ignore="ContentDescription" />
     </androidx.cardview.widget.CardView>
 
     <TextView
-            android:foreground="@null"
-            android:id="@+id/account_name"
-            tools:text="Account 1"
-            style="@style/SettingsItem" />
+        android:foreground="@null"
+        android:id="@+id/account_name"
+        tools:text="Account 1"
+        style="@style/SettingsItem" />
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/account_switch.xml b/app/src/main/res/layout/account_switch.xml
index 659ad840..5153f0e3 100644
--- a/app/src/main/res/layout/account_switch.xml
+++ b/app/src/main/res/layout/account_switch.xml
@@ -7,18 +7,20 @@
         android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/account_list"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            android:background="?attr/primaryBlackBackground"
-            tools:listitem="@layout/account_single"
-            android:layout_width="match_parent"
-            android:layout_rowWeight="1"
-            android:layout_height="wrap_content" />
+        android:id="@+id/account_list"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        android:background="?attr/primaryBlackBackground"
+        tools:listitem="@layout/account_single"
+        android:layout_width="match_parent"
+        android:layout_rowWeight="1"
+        android:layout_height="wrap_content"
+        android:focusable="true"/>
 
     <TextView
-            android:id="@+id/account_add"
-            android:text="@string/add_account"
-            style="@style/SettingsItem">
+        android:id="@+id/account_add"
+        android:text="@string/add_account"
+        style="@style/SettingsItem"
+        android:focusable="true">
 
         <requestFocus />
     </TextView>