diff --git a/Ninjacrab.PersistentWindows.Solution/Ninjacrab.PersistentWindows.SystrayShell/Program.cs b/Ninjacrab.PersistentWindows.Solution/Ninjacrab.PersistentWindows.SystrayShell/Program.cs
index 33a9ca7..34a5e3a 100755
--- a/Ninjacrab.PersistentWindows.Solution/Ninjacrab.PersistentWindows.SystrayShell/Program.cs
+++ b/Ninjacrab.PersistentWindows.Solution/Ninjacrab.PersistentWindows.SystrayShell/Program.cs
@@ -308,12 +308,24 @@ namespace Ninjacrab.PersistentWindows.SystrayShell
 
         static void EnableRestoreMenu(bool enableRestoreDB, bool checkUpgrade)
         {
-            systrayForm.UpdateMenuEnable(enableRestoreDB, checkUpgrade);
+            if (systrayForm.InvokeRequired)
+                systrayForm.BeginInvoke((Action) delegate ()
+                {
+                    systrayForm.UpdateMenuEnable(enableRestoreDB, checkUpgrade);
+                });
+            else
+                systrayForm.UpdateMenuEnable(enableRestoreDB, checkUpgrade);
         }
 
         static void EnableRestoreSnapshotMenu(bool enable)
         {
-            systrayForm.EnableSnapshotRestore(enable);
+            if (systrayForm.InvokeRequired)
+                systrayForm.BeginInvoke((Action) delegate ()
+                {
+                    systrayForm.EnableSnapshotRestore(enable);
+                });
+            else
+                systrayForm.EnableSnapshotRestore(enable);
         }
 
         static public void CaptureSnapshot(int id, bool prompt = true)