diff -r b2121d03f6f0 -r f60cfcb98c9a Server/FormMain.cs
--- a/Server/FormMain.cs	Sun Aug 21 18:35:58 2016 +0200
+++ b/Server/FormMain.cs	Sun Aug 21 19:31:08 2016 +0200
@@ -2576,8 +2576,6 @@
                 try
                 {
                     await ConnectHarmonyAsync();
-                    //To make sure harmony commands are showing device name instead of device id
-                    PopulateEventsTreeView();
                 }
                 finally
                 {
@@ -3041,6 +3039,9 @@
             PopulateTreeViewHarmony(Program.HarmonyConfig);
 
             Console.WriteLine("Harmony: Ready");
+
+            //Make sure harmony command actions are showing device name instead of device id
+            PopulateEventsTreeView();
         }
 
         /// <summary>