diff --git a/legacy/ui/legacy/src/main/res/layout/message_compose_recipients.xml b/legacy/ui/legacy/src/main/res/layout/message_compose_recipients.xml
index 2c70b76b06e..d9c88ebf54b 100644
--- a/legacy/ui/legacy/src/main/res/layout/message_compose_recipients.xml
+++ b/legacy/ui/legacy/src/main/res/layout/message_compose_recipients.xml
@@ -252,6 +252,7 @@
             android:background="@android:color/transparent"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
+            android:focusable="true"
             android:dropDownWidth="wrap_content"
             style="@style/RecipientEditText"
             />
diff --git a/legacy/ui/legacy/src/main/res/layout/message_list_fragment.xml b/legacy/ui/legacy/src/main/res/layout/message_list_fragment.xml
index 7a804067d09..e0695e3ea84 100644
--- a/legacy/ui/legacy/src/main/res/layout/message_list_fragment.xml
+++ b/legacy/ui/legacy/src/main/res/layout/message_list_fragment.xml
@@ -8,6 +8,17 @@
     android:layout_height="match_parent"
     tools:context=".messagelist.MessageListFragment"
     >
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floating_action_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/floatingActionButtonMargin"
+        android:contentDescription="@string/compose_action"
+        app:layout_behavior="com.fsck.k9.ui.fab.HideFabOnScrollBehavior"
+        app:srcCompat="@drawable/ic_edit"
+        android:focusable="true"
+        />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swiperefresh"
@@ -29,15 +40,6 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floating_action_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/floatingActionButtonMargin"
-        android:contentDescription="@string/compose_action"
-        app:layout_behavior="com.fsck.k9.ui.fab.HideFabOnScrollBehavior"
-        app:srcCompat="@drawable/ic_edit"
-        />
+
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>