diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 7bb13b36c3..bd1e2cd88b 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3493,10 +3493,7 @@ void LLInventoryModel::emptyFolderType(const std::string notification, LLFolderT
 			LLInventoryModel::item_array_t items;
 			const LLUUID trash_id = findCategoryUUIDForType(preferred_type);
 			gInventory.collectDescendents(trash_id, cats, items, LLInventoryModel::INCLUDE_TRASH); //All descendants
-			// <FS:Ansariel> FIRE-21630: Make item count match counting method for inventory (don't include folders)
-			//S32 item_count = items.size() + cats.size();
-			S32 item_count = items.size();
-			// </FS:Ansariel>
+			S32 item_count = items.size() + cats.size();
 			args["COUNT"] = item_count;
 		}
 		LLNotificationsUtil::add(notification, args, LLSD(),
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 530b4ceeda..de1be392cb 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1008,9 +1008,15 @@ void LLPanelMainInventory::draw()
 
 void LLPanelMainInventory::updateItemcountText()
 {
-	if(mItemCount != gInventory.getItemCount())
+	// <FS:Ansariel> Include folders in inventory count
+	//if(mItemCount != gInventory.getItemCount())
+	//{
+	//	mItemCount = gInventory.getItemCount();
+	S32 new_count = gInventory.getItemCount() + gInventory.getCategoryCount();
+	if(mItemCount != new_count)
 	{
-		mItemCount = gInventory.getItemCount();
+		mItemCount = new_count;
+	// </FS:Ansariel>
 		mItemCountString = "";
 		// <FS:Ansariel> Use user-default locale from operating system
 		//LLLocale locale(LLLocale::USER_LOCALE);