diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c
index 98fe43f00b..503b8abdaf 100644
--- a/base/applications/regedit/find.c
+++ b/base/applications/regedit/find.c
@@ -205,7 +205,7 @@ BOOL RegFindRecurse(
             fPast = TRUE;
             continue;
         }
-        if (!fPast)
+        if (!fPast && (pszValueName != s_empty))
             continue;
 
         if ((s_dwFlags & RSF_LOOKATVALUES) &&