diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 865d9ad4d1..bb85f6b3d0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -965,6 +965,16 @@ public class FragmentCompose extends FragmentBase {
 
     private void onMenuAddresses() {
         grpAddresses.setVisibility(grpAddresses.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+
+        new Handler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (grpAddresses.getVisibility() == View.GONE)
+                    etSubject.requestFocus();
+                else
+                    etCc.requestFocus();
+            }
+        });
     }
 
     private void onMenuZoom() {