diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index b4f9176f9a3e0f7a2bf8de70a79423761e7530d4..c197c78a415c86dd9deec5f16605f770ec87d521 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -233,10 +233,6 @@ void handleNameTagOptionChanged(const LLSD& newvalue)
 	{
 		gSavedSettings.setBOOL("SmallAvatarNames", TRUE);
 	}
-	else
-	{
-		gSavedSettings.setBOOL("SmallAvatarNames", FALSE);
-	}
 }
 
 bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index f6074805c7358477749e26753d8eb1778c5286a9..a94cfbeec46e45f4bc4715d59220e1296dd3fdbc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -275,6 +275,7 @@
      top_pad="5"
      width="300" />
     <check_box
+	 enabled_control="AvatarNameTagMode"
      control_name="SmallAvatarNames"
      height="16"
      initial_value="true"