diff --git a/es-app/src/CollectionSystemManager.cpp b/es-app/src/CollectionSystemManager.cpp
index eb8162845..6526a5faf 100644
--- a/es-app/src/CollectionSystemManager.cpp
+++ b/es-app/src/CollectionSystemManager.cpp
@@ -565,6 +565,7 @@ void CollectionSystemManager::updateCollectionFolderMetadata(SystemData* sys)
 	std::string genre = "None";
 	std::string video = "";
 	std::string thumbnail = "";
+	std::string image = "";
 
 	std::unordered_map<std::string, FileData*> games = rootFolder->getChildrenByFilename();
 
@@ -608,6 +609,7 @@ void CollectionSystemManager::updateCollectionFolderMetadata(SystemData* sys)
 
 		video = randomGame->getVideoPath();
 		thumbnail = randomGame->getThumbnailPath();
+		image = randomGame->getImagePath();
 	}
 
 
@@ -618,7 +620,8 @@ void CollectionSystemManager::updateCollectionFolderMetadata(SystemData* sys)
 	rootFolder->metadata.set("releasedate", releasedate);
 	rootFolder->metadata.set("developer", developer);
 	rootFolder->metadata.set("video", video);
-	rootFolder->metadata.set("image", thumbnail);
+	rootFolder->metadata.set("thumbnail", thumbnail);
+	rootFolder->metadata.set("image", image);
 }
 
 void CollectionSystemManager::initCustomCollectionSystems()
diff --git a/es-app/src/views/gamelist/VideoGameListView.cpp b/es-app/src/views/gamelist/VideoGameListView.cpp
index 6de7caf8f..da7e2e259 100644
--- a/es-app/src/views/gamelist/VideoGameListView.cpp
+++ b/es-app/src/views/gamelist/VideoGameListView.cpp
@@ -245,7 +245,7 @@ void VideoGameListView::updateInfoPanel()
 
 		mVideo->setImage(file->getThumbnailPath());
 		mMarquee.setImage(file->getMarqueePath());
-		mImage.setImage(file->getThumbnailPath());
+		mImage.setImage(file->getImagePath());
 
 		mDescription.setText(file->metadata.get("desc"));
 		mDescContainer.reset();