diff --git "a/base/applications/regedit/find.c" "b/base/applications/regedit/find.c"
index c970a53cf51..82e1ebd60a6 100644
--- "a/base/applications/regedit/find.c"
+++ "b/base/applications/regedit/find.c"
@@ -192,8 +192,8 @@ BOOL RegFindRecurse(
 
     qsort(ppszNames, c, sizeof(LPWSTR), compare);
 
-    if (pszValueName == NULL)
-        pszValueName = ppszNames[0];
+    if (pszValueName == NULL)        // Removed by Jose Carlos Jesus 6/19/22
+        pszValueName = s_empty;      // Removed by Jose Carlos Jesus 6/19/22
 
     for(i = 0; i < c; i++)
     {
@@ -205,7 +205,7 @@ BOOL RegFindRecurse(
             fPast = TRUE;
             continue;
         }
-        if (!fPast)
+        if (!fPast && (pszValueName != s_empty))
             continue;
 
         if ((s_dwFlags & RSF_LOOKATVALUES) &&