diff --git a/ChangeLog b/ChangeLog
index a07a7bfc8..1d47e3863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-08  Miguel de Icaza  <miguel@novell.com>
+
+	* gtk/Application.cs (Invoke): Use Timeout instead of Idle add to
+	trigger the event on the Gtk thread.
+
 2005-10-09  Mike Kestner  <mkestner@novell.com>
 
 	* Makefile.include : reference Mono.Cairo.dll.
diff --git a/gtk/Application.cs b/gtk/Application.cs
index 3fdd38688..3f1bd2cf1 100755
--- a/gtk/Application.cs
+++ b/gtk/Application.cs
@@ -172,14 +172,14 @@ namespace Gtk {
 		{
 			InvokeCB icb = new InvokeCB (d);
 			
-			GLib.Idle.Add (new GLib.IdleHandler (icb.Invoke));
+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (icb.Invoke));
 		}
 
 		public static void Invoke (object sender, EventArgs args, EventHandler d)
 		{
 			InvokeCB icb = new InvokeCB (d, sender, args);
 			
-			GLib.Idle.Add (new GLib.IdleHandler (icb.Invoke));
+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (icb.Invoke));
 		}
 	}
 }