diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 918c17e6..515b3ec4 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -688,6 +688,7 @@ class ChatController extends State<Chat> {
         break;
       case EmojiPickerType.keyboard:
         typeEmoji(emoji);
+        onInputBarChanged(sendController.text);
         break;
     }
   }
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index d2939e37..0d33baf0 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -155,6 +155,9 @@ class ChatView extends StatelessWidget {
         if (controller.selectedEvents.isNotEmpty) {
           controller.clearSelectedEvents();
           redirector.stopRedirection();
+        } else if (controller.showEmojiPicker) {
+          controller.emojiPickerAction();
+          redirector.stopRedirection();
         }
       },
       child: GestureDetector(