diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1feb34602..d43805e5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -141,6 +141,7 @@ v1.2 maintenance release.
 
 ### Bug fixes
 
+* Using a custom image directory for the slideshow screensaver would hang the application if there was only a single image
 * Navigating the list of alternative emulators would sometimes lead to an incorrect row positioning
 
 ## Version 1.2.2
diff --git a/es-app/src/Screensaver.cpp b/es-app/src/Screensaver.cpp
index b2e399dc8..bc12f2e2d 100644
--- a/es-app/src/Screensaver.cpp
+++ b/es-app/src/Screensaver.cpp
@@ -570,7 +570,7 @@ void Screensaver::pickRandomCustomImage(std::string& path)
     if (mImageCustomFiles.size() == 0)
         return;
 
-    if (mVideoFiles.size() == 1) {
+    if (mImageCustomFiles.size() == 1) {
         mPreviousCustomImage = mImageCustomFiles.front();
         path = mImageCustomFiles.front();
         return;