diff --git a/Resources/Plugins/emoji-keyboard/browser.js b/Resources/Plugins/emoji-keyboard/browser.js
index 05d63fb3..4fde5e07 100644
--- a/Resources/Plugins/emoji-keyboard/browser.js
+++ b/Resources/Plugins/emoji-keyboard/browser.js
@@ -58,6 +58,7 @@ enabled(){
     this.currentKeyboard = null;
     
     $(".emoji-keyboard-popup-btn").removeClass("is-selected");
+    $(".js-compose-text").first().focus();
   };
   
   var generateEmojiHTML = skinTone => {