1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 45c33728e5..df973a15b5 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -577,6 +577,8 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
 {
     if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
     {
+        mFilter->setFocus(TRUE);
+
         if (button == mGroupButtons[sSelectedGroupIndex] || button->getToggleState())
             return;
 
@@ -595,8 +597,6 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
         rect.mRight = button->getRect().mRight;
         mBadge->setRect(rect);
 
-        mFilter->setFocus(TRUE);
-
         fillEmojis();
     }
 }