diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 0eb91f7f8..7ddc609fd 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -345,7 +345,9 @@ BOOL LLFloaterAvatarList::postBuild()
 	mAvatarList = getChild<LLScrollListCtrl>("avatar_list");
 	mAvatarList->sortByColumn("distance", TRUE);
 	mAvatarList->setCommitOnSelectionChange(TRUE);
-	childSetCommitCallback("avatar_list", onSelectName, this);
+	mAvatarList->setCallbackUserData(this);
+	mAvatarList->setCommitCallback(onSelectName);
+	mAvatarList->setDoubleClickCallback(onClickFocus);
 	refreshAvatarList();
 
 	gIdleCallbacks.addFunction(LLFloaterAvatarList::callbackIdle);