diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index 10123d178..16d394ac9 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -538,12 +538,19 @@ function insertGhostDivs(element) {
 	});
 }
 
-function loadEmojis(inputTargetIDName)
+const emojiModal = document.getElementById('emojiModal')
+
 {
 	selecting = false;
 	speed_carot_modal.style.display = "none";
 
-	if (inputTargetIDName) emojiInputTargetDOM = document.getElementById(inputTargetIDName);
+	emojiInputTargetDOM = document.getElementById(inputTargetIDName);
+
+	emojiModal.addEventListener('hide.bs.modal', () => {
+		setTimeout(() => {
+			emojiInputTargetDOM.focus();
+		}, 200);
+	}, {once : true});	
 
 	switch (emojiEngineState) {
 		case "inactive":