diff --git a/source/draw.c b/source/draw.c
index 7eb78c3..b77328a 100644
--- a/source/draw.c
+++ b/source/draw.c
@@ -115,6 +115,11 @@ void draw_qr(void)
     }
 }
 
+void draw_shuffle_selection(int shuffled_theme_count)
+{
+    pp2d_draw_text(36, 2, 0.6, 0.6, COLOR_WHITE, "%d/10", shuffled_theme_count);
+}
+
 void draw_base_interface(void)
 {
     pp2d_begin_draw(GFX_TOP);
diff --git a/source/main.c b/source/main.c
index d482cea..9b36d10 100644
--- a/source/main.c
+++ b/source/main.c
@@ -199,6 +199,7 @@ int main(void)
                         current_theme->in_shuffle = false;
                     } 
                 }
+                draw_shuffle_selection(shuffle_theme_count);
             }
         }
 
diff --git a/source/themes.c b/source/themes.c
index 31d3164..ccb7df5 100644
--- a/source/themes.c
+++ b/source/themes.c
@@ -393,7 +393,7 @@ Result shuffle_install(Theme_s *themes_list, int theme_count)
     u32 bgm_sizes[10] = {0};
     for (int i = 0; i < theme_count; i++)
     {
-        if (count > 9) return MAKERESULT(RL_USAGE, RS_INVALIDARG, RM_COMMON, RD_INVALID_SELECTION);
+        if (count > 10) return MAKERESULT(RL_USAGE, RS_INVALIDARG, RM_COMMON, RD_INVALID_SELECTION);
         if (themes_list[i].in_shuffle)
         {
             shuffle_themes[count++] = &themes_list[i];