1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 51b31a72ca..78b94d1b0c 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -333,6 +333,14 @@ void LLFloaterEmojiPicker::onOpen(const LLSD& key)
     gFloaterView->adjustToFitScreen(this, FALSE);
 }
 
+void LLFloaterEmojiPicker::onClose(bool app_quitting)
+{
+    if (!app_quitting)
+    {
+        LLEmojiHelper::instance().hideHelper(nullptr, true);
+    }
+}
+
 void LLFloaterEmojiPicker::dirtyRect()
 {
     super::dirtyRect();