diff --git a/ChangeLog b/ChangeLog
index 247b71645..c9bccf162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-17  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/Window.cs : override Raw prop and take a ref, since gtk+
+	owns the ref to new Windows, and we need a ref.  [Fixes #47721]
+
 2003-10-17  Mike Kestner  <mkestner@ximian.com>
 
 	* gnome/CanvasPoints.custom : make New overload a ctor overload.
diff --git a/gtk/Object.custom b/gtk/Object.custom
index 153fa6d1d..f6783fe02 100755
--- a/gtk/Object.custom
+++ b/gtk/Object.custom
@@ -1,8 +1,8 @@
-// Gtk.Object.custom - Gtk Window class customizations
+// Gtk.Object.custom - Gtk Object class customizations
 //
 // Author: Mike Kestner <mkestner@speakeasy.net>
 //
-// (c) 2002 Mike Kestner
+// (c) 2002-2003 Mike Kestner
 //
 // This code is inserted after the automatically generated code.
 
diff --git a/gtk/Window.custom b/gtk/Window.custom
index f3e93ca76..5012c9286 100755
--- a/gtk/Window.custom
+++ b/gtk/Window.custom
@@ -7,6 +7,19 @@
 // This code is inserted after the automatically generated code.
 
 
+		[DllImport("libgobject-2.0-0.dll")]
+		private static extern void g_object_ref (IntPtr raw);
+
+		protected override IntPtr Raw {
+			get {
+				return base.Raw;
+			}
+			set {
+				base.Raw = value;
+				g_object_ref (value);
+			}
+		}
+
 		/// <summary>
 		///	Window Constructor
 		/// </summary>