diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 92a80a517..f410bd615 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -500,18 +500,9 @@ void LLFloaterAvatarList::assessColumns()
 
 		if(!client_hidden)
 		{
-			name_col->setWidth(width_name);
+			name_col->setWidth(llmax(width_name.get(),10));
 		}
 	}
-	else if (!hide_client)
-	{
-		mAvatarList->getColumn(LIST_CLIENT)->setWidth(0);
-		mAvatarList->getColumn(LIST_AVATAR_NAME)->setWidth(0);
-		mAvatarList->getColumn(LIST_AVATAR_NAME)->mDynamicWidth = FALSE;
-		mAvatarList->getColumn(LIST_AVATAR_NAME)->mRelWidth = 0;
-		mAvatarList->getColumn(LIST_CLIENT)->mDynamicWidth = TRUE;
-		mAvatarList->getColumn(LIST_CLIENT)->mRelWidth = -1;
-	}
 
 	mAvatarList->updateLayout();
 }