diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 2d6ceee3f7e4a8fddeae147a878bc571579a8597..54f1ca380433012e59a7d5fab1ef4e291df4cbe9 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -657,11 +657,11 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
 
 	if ("collapse_all" == command_name)
 	{
-		return has_expanded_folders(mCurrentSelectedList->getRootFolder());
+		return mCurrentSelectedList && has_expanded_folders(mCurrentSelectedList->getRootFolder());
 	}
 	else if ("expand_all" == command_name)
 	{
-		return has_collapsed_folders(mCurrentSelectedList->getRootFolder());
+		return mCurrentSelectedList && has_collapsed_folders(mCurrentSelectedList->getRootFolder());
 	}
 	else if ("sort_by_date"	== command_name)
 	{