diff --git a/src/Eto.WinForms/Forms/ApplicationHandler.cs b/src/Eto.WinForms/Forms/ApplicationHandler.cs
index d18fe795a..6c4d66ba4 100644
--- a/src/Eto.WinForms/Forms/ApplicationHandler.cs
+++ b/src/Eto.WinForms/Forms/ApplicationHandler.cs
@@ -8,6 +8,7 @@ public class ApplicationHandler : WidgetHandler<object, Application, Application
 		bool quitting;
 		readonly Thread mainThread;
 		SynchronizationContext context;
+		swf.ApplicationContext applicationContext = new swf.ApplicationContext();
 		public static bool EnableScrollingUnderMouse = true;
 		public static bool BubbleMouseEvents = true;
 		public static bool BubbleKeyEvents = true;
@@ -115,10 +116,7 @@ public void Run()
 
 				if (!quitting)
 				{
-					if (Widget.MainForm != null && Widget.MainForm.Loaded)
-						swf.Application.Run((swf.Form)Widget.MainForm.ControlObject);
-					else
-						swf.Application.Run();
+					swf.Application.Run(applicationContext);
 				}
 			}
 			else
@@ -230,6 +228,7 @@ public void Attach(object context)
 
 		public void OnMainFormChanged()
 		{
+			applicationContext.MainForm = (swf.Form)Widget.MainForm.ControlObject;
 		}
 
 		public void Quit()