diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a66b4cf24a..f08f727b2f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26748,16 +26748,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FSSuppressEmojiWindowPopupWhileTyping</key>
+    <key>FSEnableEmojiWindowPopupWhileTyping</key>
     <map>
       <key>Comment</key>
-      <string>Suppress emoji chooser window from automatically popping up while typing in chat bars.</string>
+      <string>Enables automatic opening of emoji chooser window while typing in chat bars.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
 </map>
 </llsd>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index ab9ab1fe22..b9a11d2c73 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -147,6 +147,7 @@
 			<check_box label="Automatische Namensvorhersage in „Chat in der Nähe“-Eingabezeile aktivieren" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="„:“ als Synonym für &quot;/me&quot; verwenden"/>
 			<check_box name="AutoCloseOOC" label="((OOC))-Klammern automatisch schließen"/>
+			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Automatisches Emoji-Auswahlfenster beim Chateingabe aktivieren"/>
 			<check_box name="FSShowEmojiButton" label="Emoji-Button in Eingabezeile für Lokaler Chat IM-Sitzungen anzeigen"/>
 			<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
 			<check_box name="FSNearbyChatbar" label="Eingabezeile zum Fenster Lokaler Chat hinzufügen"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 258742d022..947fe1b29a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -910,9 +910,9 @@
 		 top_pad="1"
 		 height="16"
 		 width="400"
-		 control_name="FSSuppressEmojiWindowPopupWhileTyping"
-		 name="FSSuppressEmojiWindowPopupWhileTyping"
-		 label="Suppress emoji chooser window from automatically popping up while typing in chat bars"/>
+		 control_name="FSEnableEmojiWindowPopupWhileTyping"
+		 name="FSEnableEmojiWindowPopupWhileTyping"
+		 label="Enable automatic emoji picker window while typing in chat bars"/>
 		<check_box
 		 layout="topleft"
 		 top_pad="1"