diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 472ee233d5..89fa7e5cb7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1812,6 +1812,8 @@ public class FragmentCompose extends FragmentBase {
         etTo.setText(etTo.getText());
         etCc.setText(etCc.getText());
         etBcc.setText(etBcc.getText());
+
+        etSubject.requestFocus();
     }
 
     private void onMenuSendDialog() {