diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e3fae2ef30..9eddd1c15e 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14,6 +14,17 @@
     <integer>1</integer>
   </map>
 
+	<key>FSPlayTypingSound</key>
+	<map>
+		<key>Comment</key>
+		<string>Hear the typing sound when others type in to local chat</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>1</integer>
+	</map>
 	<key>FSShowIMInChatHistory</key>
 	<map>
 		<key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 41aac6fb4e..d100b34e4f 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4658,7 +4658,7 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
 					//	gAudiop->triggerSound(LLUUID(gSavedSettings.getString("UISndTyping")), 1.0f, LLAudioEngine::AUDIO_TYPE_UI);
 					//}
 					//else
-					if(gSavedSettings.getBOOL("PhoenixPlayTypingSound"))
+					if(gSavedSettings.getBOOL("FSPlayTypingSound"))
 					{
 						LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
 						gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
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 cabe3040c2..af725fecd2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -134,7 +134,7 @@
      name="play_avatar_animations"
      width="400" /> 
     <check_box
-     control_name="PhoenixPlayTypingSound"
+     control_name="FSPlayTypingSound"
      follows="left|top"
      height="16"
      label="Hear typing sound when people type in local chat"