diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index 2cd66807..d2d25333 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -332,9 +332,10 @@ class MessageActionsModal extends StatelessWidget {
                     ? editMessageInputBuilder(context, message)
                     : MessageInput(
                         editMessage: message,
-                        onMessageSent: (_) {
+                        preMessageSending: (m) {
                           FocusScope.of(context).unfocus();
                           Navigator.pop(context);
+                          return m;
                         },
                       ),
               ),
diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 8436d526..654aa068 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -1976,10 +1976,6 @@ class MessageInputState extends State<MessageInput> {
     return sendingFuture.then((resp) {
       if (widget.onMessageSent != null) {
         widget.onMessageSent(resp.message);
-      } else {
-        if (widget.editMessage != null) {
-          Navigator.pop(context);
-        }
       }
     });
   }