diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index ecaa2cb31634c815ed84aea5d79bca9464ca2adc..77131efd754009ff0efccdfd362f9b143e62923a 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2359,6 +2359,11 @@ void LLAgentCamera::changeCameraToCustomizeAvatar()
 	gAgent.standUp(); // force stand up
 	gViewerWindow->getWindow()->resetBusyCount();
 
+    if (LLSelectMgr::getInstance()->getSelection()->isAttachment())
+    {
+        LLSelectMgr::getInstance()->deselectAll();
+    }
+
 	if (gFaceEditToolset)
 	{
 		LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset);