diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 58947f941..5e6be0394 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -952,6 +952,9 @@ class ChatController extends State<ChatPageWithRoom>
     }
 
     final previousEdit = editEvent;
+    if (showEmojiPicker) {
+      hideEmojiPicker();
+    }
 
     room
         .pangeaSendTextEvent(