diff --git a/commands/compose/send.go b/commands/compose/send.go
index ed3bd43..40ab455 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -80,6 +80,7 @@ func SendMessage(aerc *widgets.Aerc, args []string) error {
 	}
 
 	aerc.SetStatus("Sending...")
+	aerc.RemoveTab(composer)
 
 	sendAsync := func() {
 		tlsConfig := &tls.Config{
@@ -151,7 +152,6 @@ func SendMessage(aerc *widgets.Aerc, args []string) error {
 		defer wc.Close()
 		composer.WriteMessage(header, wc)
 		composer.Close()
-		aerc.RemoveTab(composer)
 	}
 
 	go func() {