diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c
index f781d3c938e..5d74ea8703c 100644
--- a/programs/uninstaller/main.c
+++ b/programs/uninstaller/main.c
@@ -209,8 +209,12 @@ static int FetchFromRootKey(HKEY root)
                 command = HeapAlloc(GetProcessHeap(), 0, uninstlen);
                 RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen);
             }
-            else continue;
-
+            else
+            {
+                RegCloseKey(hkeyApp);
+                sizeOfSubKeyName = 255;
+                continue;
+            }
             numentries++;
             entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry));
             entries[numentries-1].root = root;