diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index d354b0a15..b45e21e36 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1925,7 +1925,10 @@ class ChatController extends State<ChatPageWithRoom>
       return;
     }
     // Close emoji picker, if open
-    showEmojiPicker = false;
+    if (showEmojiPicker) {
+      hideEmojiPicker();
+      return;
+    }
 
     // Check if the user has set their languages. If not, prompt them to do so.
     if (!MatrixState.pangeaController.languageController.languagesSet) {