diff --git a/app/MainWindow.xaml.cs b/app/MainWindow.xaml.cs
index 50c7540..6b2bbf1 100644
--- a/app/MainWindow.xaml.cs
+++ b/app/MainWindow.xaml.cs
@@ -142,7 +142,7 @@ namespace ParsecVDisplay
         {
             e.Handled = true;
             UpdateDriverLabel();
-            Tray.Instance?.QueryDriver(null, null);
+            Tray.Instance.Invoke(() => Tray.Instance.QueryDriver(null, null));
         }
 
         private void OpenRepoLink(object sender, MouseButtonEventArgs e)
diff --git a/app/Tray.cs b/app/Tray.cs
index e47413f..39661a6 100644
--- a/app/Tray.cs
+++ b/app/Tray.cs
@@ -406,7 +406,7 @@ namespace ParsecVDisplay
 
         public void Invoke(Action action)
         {
-            TrayIcon.ContextMenuStrip.Invoke(action);
+            TrayIcon.ContextMenuStrip.BeginInvoke(action);
         }
 
         private void SetLanguage(object sender, EventArgs e)