diff --git a/PKHeX.WinForms/Subforms/SAV_FolderList.cs b/PKHeX.WinForms/Subforms/SAV_FolderList.cs
index 00c2228b6..c06705b45 100644
--- a/PKHeX.WinForms/Subforms/SAV_FolderList.cs
+++ b/PKHeX.WinForms/Subforms/SAV_FolderList.cs
@@ -262,14 +262,14 @@ private SaveList<SavePreview> PopulateData(DataGridView dgData, IEnumerable<Save
             LoadEntryInitial(dgData, list, sav1);
             Task.Run(async () => // load the rest async
             {
+                while (!dgData.IsHandleCreated)
+                    await Task.Delay(15).ConfigureAwait(false);
                 while (enumerator.MoveNext())
                 {
                     var next = enumerator.Current;
                     if (next == null)
                         continue;
                     var sav = new SavePreview(next, GetParentFolderName(next));
-                    while (!dgData.IsHandleCreated)
-                        await Task.Delay(100).ConfigureAwait(false);
                     dgData.Invoke(new Action(() => LoadEntry(dgData, list, sav)));
                 }
                 enumerator.Dispose();