diff --git a/source/main.c b/source/main.c
index 2a83ed2..64b9df3 100644
--- a/source/main.c
+++ b/source/main.c
@@ -217,6 +217,7 @@ int main(void)
                 {
                     draw_theme_install(SHUFFLE_INSTALL);
                     shuffle_install(themes_list, theme_count);
+                    shuffle_theme_count = 0;
                 }
             }
         }
diff --git a/source/themes.c b/source/themes.c
index ccb7df5..ec336f1 100644
--- a/source/themes.c
+++ b/source/themes.c
@@ -397,6 +397,7 @@ Result shuffle_install(Theme_s *themes_list, int theme_count)
         if (themes_list[i].in_shuffle)
         {
             shuffle_themes[count++] = &themes_list[i];
+            themes_list[i].in_shuffle = false;
         }
     }
     for (int i = 0; i < count; i++)