diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index b87851490db2ace3a2bcdff5daf0a589725be5eb..6eb214cb932b2c4969d307411b9be560c5b12ed8 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1067,6 +1067,7 @@ void LLFlatListView::setNoItemsCommentVisible(bool visible) const
 			mNoItemsCommentTextbox->setRect(comment_rect);
 */
 		}
+		mSelectedItemsBorder->setVisible(FALSE);
 		mNoItemsCommentTextbox->setVisible(visible);
 	}
 }
@@ -1096,7 +1097,10 @@ void LLFlatListView::getValues(std::vector<LLSD>& values) const
 // virtual
 void LLFlatListView::onFocusReceived()
 {
-	mSelectedItemsBorder->setVisible(TRUE);
+	if (size())
+	{
+		mSelectedItemsBorder->setVisible(TRUE);
+	}
 	gEditMenuHandler = this;
 }
 // virtual