diff --git a/glib/GLibSynchronizationContext.cs b/glib/GLibSynchronizationContext.cs
new file mode 100644
index 000000000..0f8909298
--- /dev/null
+++ b/glib/GLibSynchronizationContext.cs
@@ -0,0 +1,71 @@
+//
+// GLibSynchronizationContext.cs
+// 
+// Author:
+//       Rickard Edström <ickard@gmail.com>
+//
+// Copyright (c) 2010 Rickard Edström
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace GLib
+{
+	public class GLibSynchronizationContext : SynchronizationContext
+	{
+		public override void Post (SendOrPostCallback d, object state)
+		{
+			PostAction (() => d (state));
+		}
+
+		public override void Send (SendOrPostCallback d, object state)
+		{
+			var mre = new ManualResetEvent (false);
+			Exception error = null;
+			
+			PostAction (() =>
+			{
+				try {
+					d (state);
+				} catch (Exception ex) {
+					error = ex;
+				} finally {
+					mre.Set ();
+				}
+			});
+			
+			mre.WaitOne ();
+			
+			if (error != null) {
+				throw error;
+			}
+		}
+
+		void PostAction (Action action)
+		{
+			Idle.Add (() =>
+			{
+				action ();
+				return false;
+			});
+		}
+	}
+}
diff --git a/glib/Makefile.am b/glib/Makefile.am
index d10c3ba20..b23c11ad6 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -29,6 +29,7 @@ sources =		 			\
 	GException.cs				\
 	GInterfaceAdapter.cs			\
 	GInterfaceAttribute.cs			\
+	GLibSynchronizationContext.cs		\
 	Global.cs				\
 	GString.cs				\
 	GType.cs				\
diff --git a/glib/glib.csproj b/glib/glib.csproj
index 099365316..b2665bfd5 100644
--- a/glib/glib.csproj
+++ b/glib/glib.csproj
@@ -85,5 +85,6 @@
     <Compile Include="ValueArray.cs" />
     <Compile Include="Variant.cs" />
     <Compile Include="VariantType.cs" />
+    <Compile Include="GLibSynchronizationContext.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/gtk/Application.cs b/gtk/Application.cs
index b54187b40..a37139cd9 100755
--- a/gtk/Application.cs
+++ b/gtk/Application.cs
@@ -23,6 +23,7 @@ namespace Gtk {
 	using System;
 	using System.Reflection;
 	using System.Runtime.InteropServices;
+	using System.Threading;
 	using Gdk;
 
 	public partial class Application {
@@ -73,6 +74,8 @@ namespace Gtk {
 			int argc = 0;
 
 			gtk_init (ref argc, ref argv);
+
+			SynchronizationContext.SetSynchronizationContext (new GLib.GLibSynchronizationContext ());
 		}
 
 		static bool do_init (string progname, ref string[] args, bool check)