diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 154a3ef598..ffc7b5cee3 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -866,6 +866,16 @@ void LLInventoryFilter::setFilterSubString(const std::string& string)
 		{
 			mFilterOps.mFilterTypes &= ~FILTERTYPE_UUID;
 			mFilterOps.mFilterUUID = LLUUID::null;
+			// <FS:Ansariel> Find all links unhiding hidden empty system folders
+			if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
+			{
+				setFilterEmptySystemFolders();
+			}
+			else
+			{
+				removeFilterEmptySystemFolders();
+			}
+			// </FS:Ansariel>
 			setModified(FILTER_RESTART);
 		}
 	}