diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c
index 31c6715e98..b47a73d6f1 100644
--- a/menu/cbs/menu_cbs_scan.c
+++ b/menu/cbs/menu_cbs_scan.c
@@ -91,11 +91,13 @@ int action_switch_thumbnail(const char *path,
 
    if (!settings)
       return -1;
+   if (settings->menu.thumbnails == 0)
+      return 0;
 
    settings->menu.thumbnails++;
 
    if (settings->menu.thumbnails > 3)
-      settings->menu.thumbnails = 0;
+      settings->menu.thumbnails = 1;
 
    menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH, NULL);
    menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE, NULL);