diff --git a/ChangeLog b/ChangeLog
index 3573eb13a..7740f495c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-23  Martin Baulig  <martin@ximian.com>
+
+	* glib/Object.cs (Dispose): Call `Objects.Remove (_obj)' here
+	instead of in PerformQueuedUnrefs().
+
 2003-03-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* sample/Fifteen.cs: work-around for bug 106145 in gnome bugzilla.
diff --git a/glib/Object.cs b/glib/Object.cs
index 5b9829e3f..a1adeacf7 100644
--- a/glib/Object.cs
+++ b/glib/Object.cs
@@ -66,7 +66,6 @@ namespace GLib {
 				if (o._obj == IntPtr.Zero)
 					continue;
 				
-				Objects.Remove (o._obj);
 				o.Unref ();
 				o._obj = IntPtr.Zero;
 			}
@@ -89,6 +88,7 @@ namespace GLib {
 				return;
 
 			disposed = true;
+			Objects.Remove (_obj);
 			lock (PendingDestroys){
 				PendingDestroys.Enqueue (this);
 				lock (typeof (Object)){