diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index 6ac851ede..8ebf6bc04 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -238,8 +238,11 @@ BOOL LLScrollListText::needsToolTip() const
 	if (LLScrollListCell::needsToolTip())
 		return LLScrollListCell::needsToolTip();
 
+	/* Singu Note: To maintain legacy behavior, show tooltips for any text
 	// ...otherwise, show tooltips for truncated text
 	return mFont->getWidth(mText.getString()) > getWidth();
+	*/
+	return !mText.empty();
 }
 
 //virtual