1 files changed, 4 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
index 8ca933397..448625f27 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
@@ -166,6 +166,10 @@ namespace Tango.MachineStudio.UI.Notifications
             view.Loaded += (x, y) =>
             {
                 VM context = view.DataContext as VM;
+                if (context == null)
+                {
+                    context = Activator.CreateInstance<VM>();
+                }
                 dialog.DataContext = context;
 
                 Action onAcceptAction = null;