diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp
index 50b8aab67..6c775baac 100644
--- a/es-app/src/guis/GuiScraperMulti.cpp
+++ b/es-app/src/guis/GuiScraperMulti.cpp
@@ -12,6 +12,7 @@
 #include "guis/GuiScraperMulti.h"
 
 #include "CollectionSystemsManager.h"
+#include "FileFilterIndex.h"
 #include "Gamelist.h"
 #include "MameNames.h"
 #include "SystemData.h"
@@ -269,10 +270,13 @@ void GuiScraperMulti::acceptResult(const ScraperSearchResult& result)
 {
     ScraperSearchParams& search = mSearchQueue.front();
 
-    GuiScraperSearch::saveMetadata(result, search.game->metadata, search.game);
+    search.system->getIndex()->removeFromIndex(search.game);
 
+    GuiScraperSearch::saveMetadata(result, search.game->metadata, search.game);
     updateGamelist(search.system);
 
+    search.system->getIndex()->addToIndex(search.game);
+
     mSearchQueue.pop();
     mCurrentGame++;
     mTotalSuccessful++;