diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs
index d3670c80..555fe93e 100644
--- a/Vocaluxe/Base/CSongs.cs
+++ b/Vocaluxe/Base/CSongs.cs
@@ -339,18 +339,17 @@ namespace Vocaluxe.Base
                 SongsLoaded = false;
                 _Songs.Clear();
 
-                var files = new List<string>();
+                var files = Enumerable.Empty<string>();
                
                 using (CBenchmark.Time("List Songs"))
                 {
                     
-                    foreach (string p in CConfig.SongFolders)
+                    foreach (string path in CConfig.SongFolders)
                     {
-                        if (Directory.Exists(p))
+                        if (Directory.Exists(path))
                         {
-                            string path = p;
-                            files.AddRange(CHelper.ListFiles(path, "*.txt", true, true));
-                            files.AddRange(CHelper.ListFiles(path, "*.txd", true, true));
+                            files = files.Union(Directory.EnumerateFiles(path, "*.txt", SearchOption.AllDirectories));
+                            files = files.Union(Directory.EnumerateFiles(path, "*.txd", SearchOption.AllDirectories));
                         }
                     }
                 }