diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 46c23961f4b101a637b58a47925c9a687baf1242..6e8eac19fcd337ae1855f45d0ba717ac564f145d 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -1044,8 +1044,12 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
 			// ... but except Received folder
 			return !isReceivedFolderSelected();
 		}
+		if (mCurrentSelectedList == mLibraryInventoryPanel)
+		{
+			return false;
+		}
 		//"Add a folder" is enabled by default (case when My Landmarks is empty)
-		else return true;
+		return true;
 	}
 	else if("create_pick" == command_name)
 	{
@@ -1066,6 +1070,10 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
         {
             return false;
         }
+        if (mCurrentSelectedList == mLibraryInventoryPanel)
+        {
+            return false;
+        }
         LLFolderViewModelItemInventory* view_model = getCurSelectedViewModelItem();
         if (!view_model || view_model->getInventoryType() != LLInventoryType::IT_CATEGORY)
         {