diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp
index 20779a221..9a87bb806 100644
--- a/src/menu/loadsavemenu.cpp
+++ b/src/menu/loadsavemenu.cpp
@@ -131,7 +131,8 @@ void ClearSaveGames()
 {
 	for(unsigned i=0;i<DLoadSaveMenu::SaveGames.Size(); i++)
 	{
-		delete DLoadSaveMenu::SaveGames[i];
+		if(!DLoadSaveMenu::SaveGames[i]->bNoDelete)
+			delete DLoadSaveMenu::SaveGames[i];
 	}
 	DLoadSaveMenu::SaveGames.Clear();
 }
diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index 292da5930..def35606a 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -749,6 +749,8 @@ int I_FindClose (void *handle)
 	findstate_t *state = (findstate_t *)handle;
 	if (handle != (void*)-1 && state->count > 0)
 	{
+		for(int i = 0;i < state->count;++i)
+			free (state->namelist[i]);
 		state->count = 0;
 		free (state->namelist);
 		state->namelist = NULL;