diff --git a/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs b/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
index 2a6f0264e1..d923e47526 100644
--- a/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
+++ b/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
@@ -104,6 +104,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			Project.CustomToolsService.Initialize();
 			Project.BuildModifiedProjectsOnlyService.Initialize();
 			
+			workbench.MainForm.CreateControl(); // ensure the control is created so Invoke can work
 			WinFormsMessageService.DialogOwner = workbench.MainForm;
 			WinFormsMessageService.DialogSynchronizeInvoke = workbench.MainForm;
 			
@@ -327,6 +328,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 					t.Interval = delayMilliseconds;
 					t.Tick += delegate { 
 						t.Stop();
+						t.Dispose();
 						method();
 					};
 					t.Start();