diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index beac01f3fd..12f93e845a 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9436,15 +9436,14 @@ class FSToolsUndeform : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
-		if (avatar)
+		if (isAgentAvatarValid())
 		{
-			avatar->resetSkeleton(true);
+			gAgentAvatarp->resetSkeleton(true);
+
+			FSPose::getInstance()->setPose(gSavedSettings.getString("FSUndeformUUID"), false);
+			gAgentAvatarp->updateVisualParams();
 		}
 
-		FSPose::getInstance()->setPose(gSavedSettings.getString("FSUndeformUUID"), false);
-		gAgentAvatarp->updateVisualParams();
-		
 		return true;
 	}
 };