diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index e486bb31f1..897289cc91 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -2521,5 +2521,6 @@ void FSFloaterIM::onRecentEmojiPicked(const LLSD& value)
 
 void FSFloaterIM::onEmojiPickerToggleBtnClicked()
 {
+	mInputEditor->setFocus(TRUE);
 	mInputEditor->showEmojiHelper();
 }
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index ed95e017eb..db9c677fdf 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -1019,5 +1019,6 @@ void FSFloaterNearbyChat::onRecentEmojiPicked(const LLSD& value)
 
 void FSFloaterNearbyChat::onEmojiPickerToggleBtnClicked()
 {
+	mInputEditor->setFocus(TRUE);
 	mInputEditor->showEmojiHelper();
 }