diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index d9d922ebc4..c9d60a3a91 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -861,16 +861,19 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
    fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
          xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path));
 
-   /* Scrub characters that are not cross-platform safe from 'display name' in playlist and replace with underscore */
+   /* Scrub characters that are not cross-platform and/or violate the No-Intro filename standard:
+    * http://datomatic.no-intro.org/stuff/The%20Official%20No-Intro%20Convention%20(20071030).zip
+    * Replace these characters in the entry name with underscores
+    */
    char *scrub_char_pointer = 0;
    tmp = strdup(entry.path);
    
-   while(scrub_char_pointer = strpbrk(tmp, "&*/:`<>?\\|"))
+   while((scrub_char_pointer = strpbrk(tmp, "&*/:`<>?\\|")))
    {
       *scrub_char_pointer = '_';
    }
 
-   /* Look for thumbnail file with the scrubbed filename */
+   /* Look for thumbnail file with this scrubbed filename */
   if (tmp)
    {
       char tmp_new[PATH_MAX_LENGTH];