diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 038aae6c7b..9425a4653e 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -930,7 +930,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
       playlist_get_index(playlist, i,
             NULL, NULL, NULL, &core_name, NULL, NULL);
 
-      if (core_name && string_is_equal_fast(core_name, "imageviewer", 11))
+      if (string_is_equal(core_name, "imageviewer"))
       {
          strlcpy(xmb->thumbnail_file_path, entry.label,
                sizeof(xmb->thumbnail_file_path));
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 7cb0509e36..a809b6f9fd 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -2198,10 +2198,14 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
          break;
       case MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX:
          {
-            size_t *sel = (size_t*)data;
+            size_t *sel      = (size_t*)data;
             if (!sel)
                return false;
-            scroll_index_list[scroll_index_size++] = *sel;
+
+            if ((scroll_index_size + 1) >= SCROLL_INDEX_SIZE)
+               scroll_index_list[scroll_index_size]   = *sel;
+            else
+               scroll_index_list[scroll_index_size++] = *sel;
          }
          break;
       case MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL: