diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c
index 76773fe8a42..e0b62963b42 100644
--- a/reactos/dll/cpl/desk/background.c
+++ b/reactos/dll/cpl/desk/background.c
@@ -288,7 +288,7 @@ AddListViewItems(HWND hwndDlg, PDATA pData)
             }
 
             if(!FindNextFile(hFind, &fd))
-                hFind = INVALID_HANDLE_VALUE;
+                break;
         }
 
         token = _tcstok(NULL, separators);
diff --git a/reactos/dll/cpl/desk/screensaver.c b/reactos/dll/cpl/desk/screensaver.c
index 7eb59818bd0..02958c14b6e 100644
--- a/reactos/dll/cpl/desk/screensaver.c
+++ b/reactos/dll/cpl/desk/screensaver.c
@@ -65,7 +65,10 @@ GetCurrentScreenSaverValue(LPTSTR lpValue)
                                   (LPBYTE)lpBuf,
                                   &BufSize);
             if (Ret != ERROR_SUCCESS)
+            {
+                HeapFree(GetProcessHeap(), 0, lpBuf);
                 lpBuf = NULL;
+            }
         }
     }