diff --git a/ChangeLog b/ChangeLog
index b1c627f77..d334a5f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-07  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* gtk/Object.custom: swap the event removing and destroy calls.
+
 2008-05-07  Andres G. Aragoneses  <aaragoneses@novell.com>
 
 	* atk/Object.custom, atk/glue/object.c: Remove unneeded
diff --git a/gtk/Object.custom b/gtk/Object.custom
index 595477cb6..c769cd22e 100755
--- a/gtk/Object.custom
+++ b/gtk/Object.custom
@@ -126,8 +126,8 @@
 		{
 			if (Handle == IntPtr.Zero)
 				return;
-			InternalDestroyed -= NativeDestroyHandler;
 			gtk_object_destroy (Handle);
+			InternalDestroyed -= NativeDestroyHandler;
 		}
 
 		[DllImport("gtksharpglue-2")]