diff --git a/app/src/main/kotlin/com/wire/android/ui/emoji/EmojiPicker.kt b/app/src/main/kotlin/com/wire/android/ui/emoji/EmojiPicker.kt
index c0dc587d7f..a72f61f61a 100644
--- a/app/src/main/kotlin/com/wire/android/ui/emoji/EmojiPicker.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/emoji/EmojiPicker.kt
@@ -40,6 +40,7 @@ fun EmojiPickerBottomSheet(
                     onDismiss.invoke()
                 }
                 findViewById<EmojiPickerView>(R.id.emoji_picker)?.setOnEmojiPickedListener { emojiViewItem ->
+                    dismiss()
                     onEmojiSelected(emojiViewItem.emoji)
                 }
                 findViewById<BottomSheetDragHandleView>(R.id.handle)?.let { handle ->