diff --git a/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs b/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
index c05204c..f17ec94 100644
--- a/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
+++ b/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
@@ -271,13 +271,6 @@ namespace PersistentWindows.SystrayShell
 #endif
             AppdataFolder = appDataFolder;
 
-            if (!waiting_taskbar)
-            {
-                bool ready = WaitTaskbarReady();
-                if (!ready)
-                    return;
-            }
-
             // default icons
             IdleIcon = legacy_icon ? Properties.Resources.pwIcon2 : Properties.Resources.pwIcon;
             var iconHandle = Properties.Resources.pwIconBusy.GetHicon();
@@ -363,6 +356,13 @@ namespace PersistentWindows.SystrayShell
                 return;
             }
 
+            if (!waiting_taskbar)
+            {
+                bool ready = WaitTaskbarReady();
+                if (!ready)
+                    return;
+            }
+
             if (splash)
             {
                 StartSplashForm();