1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs
index 10314ae62..15f2fe422 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs
@@ -11,7 +11,10 @@ namespace Tango.MachineStudio.UI.Navigation
     {
         public void NavigateTo(NavigationView view)
         {
-            MainWindow.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainWindow.Instance.Dispatcher.Invoke(() =>
+            {
+                MainWindow.Instance.TransitionControl.AutoNavigate(view.ToString());
+            });
         }
     }
 }