diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index e335eabd1af7bf29e8d2aa217228e6affc5f2386..7723dbf978841398a432e91221bd0aab988e39db 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1537,6 +1537,11 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal()
 	}
 	else if (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR)
 	{
+		LLVector3 focus_target = isAgentAvatarValid()
+			? gAgentAvatarp->mHeadp->getWorldPosition()
+			: gAgent.getPositionAgent();
+		LLVector3d focus_target_global = gAgent.getPosGlobalFromAgent(focus_target);
+		mFocusTargetGlobal = focus_target_global;
 		return mFocusTargetGlobal;
 	}
 	else if (!mFocusOnAvatar)