diff --git a/public/js/Room.js b/public/js/Room.js
index d104ec82..82caf25d 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -3245,6 +3245,14 @@ function handleUsernameEmojiPicker() {
         getId('usernameInput').value += data.native;
         toggleUsernameEmoji();
     }
+
+    const initUsernameEmojiButton = getId('initUsernameEmojiButton');
+    const usernameEmoji = getId('usernameEmoji');
+    handleClickOutside(emojiUsernamePicker, initUsernameEmojiButton, () => {
+        if (usernameEmoji && !usernameEmoji.classList.contains('hidden')) {
+            usernameEmoji.classList.add('hidden');
+        }
+    });
 }
 
 function handleChatEmojiPicker() {