diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 22f441759f..b42e77cdfe 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9436,7 +9436,10 @@ static bool is_editable_selected()
 		}
 		else
 		{
-			if (!RlvActions::canEdit(hSelection->getFirstEditableObject()))
+			// RlvSelectIsEditable will sort out all editable objects
+			// => if result = NULL, we can't edit all selected objects
+			RlvSelectIsEditable f;
+			if (hSelection->getFirstRootNode(&f) != NULL)
 			{
 				return false;
 			}