diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index 39dff1609a8a25f22c5db542fa5bfe246a78b067..f35720fe169addba61bab2b94198935105d7eff4 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -24,6 +24,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>AlchemyAvatarClickFocus</key>
+    <map>
+      <key>Comment</key>
+      <string>Clicking on avatar resets camera focus</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>AlchemyAvatarListNameFormat</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index abf65f5a98116fbd0a1940cbeabdc73da8fea87e..1bd9017e196b2c1cb1f77084e3f7b6bc36fa744e 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -356,7 +356,8 @@ BOOL LLToolPie::handleLeftClickPick()
 			gViewerWindow->hideCursor();
 			LLToolCamera::getInstance()->setMouseCapture(TRUE);
 			LLToolCamera::getInstance()->pickCallback(mPick);
-			gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+			BOOL focus = gSavedSettings.getBOOL("AlchemyAvatarClickFocus");
+			gAgentCamera.setFocusOnAvatar(focus, focus);
 
 			return TRUE;
 		}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 65e922bedcf675af5e25b4c9b10ce9cd11152386..6a3f045dba6b0f671c628fc414f2c98682ce095a 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -231,6 +231,17 @@
    tool_tip="Don't run certain animations, such as landing to appear more nimble"
    width="280"
    top_pad="2" />
+  <check_box
+   control_name="AlchemyAvatarClickFocus"
+   height="16"
+   follows="left|top"
+   label="Avatar Click Focus"
+   layout="topleft"
+   left_delta="0"
+   name="ClickFocus"
+   tool_tip="Focus the camera on your avatar when clicked"
+   width="280"
+   top_pad="2" />
    <!-- End Column #2 -->
   <icon
    follows="left|top"