diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 3c8974cd28..15b6060cfd 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -684,7 +684,9 @@ void LLInvFVBridge::checkMoveToDefaultFolder(menuentry_vec_t& items, menuentry_v
 	if (isAgentInventory() && !isOutboxFolder() && !isProtectedFolder(true) && obj &&
 		obj->getActualType() != LLAssetType::AT_CATEGORY &&
 		obj->getActualType() != LLAssetType::AT_LINK_FOLDER &&
-		obj->getActualType() != LLAssetType::AT_LINK
+		obj->getActualType() != LLAssetType::AT_LINK &&
+		(!RlvFolderLocks::instance().hasLockedFolder(RLV_LOCK_ANY) || 
+			RlvFolderLocks::instance().canMoveItem(obj->getUUID(), getInventoryModel()->findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(obj->getActualType()) ) ))
 		)
 	{
 		items.push_back(std::string("Move to Default Folder"));
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 69f364f323..32a1ecbd24 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1241,6 +1241,12 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 				continue;
 			}
 
+			if (RlvFolderLocks::instance().hasLockedFolder(RLV_LOCK_ANY) &&
+				!RlvFolderLocks::instance().canMoveItem(obj->getUUID(), model->findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(obj->getActualType()) ) ))
+			{
+				continue;
+			}
+
 			LLUUID target_cat_id = model->findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(obj->getActualType()));
 			if (target_cat_id.notNull())
 			{