diff --git a/ChangeLog b/ChangeLog
index a29e0f422e..7f24aa1e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmountoperation.c: The "screen" property ought to have
+	type GdkScreen, not GtkWindow. Found by Cosimo Cecchi
+
 2008-10-24  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 556954 – gtk+/gtk/gtkrecentchooserdefault.c: mismatching
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index d2e83c47c0..42c98f786b 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -175,7 +175,7 @@ gtk_mount_operation_class_init (GtkMountOperationClass *klass)
                                    g_param_spec_object ("screen",
                                                         P_("Screen"),
                                                         P_("The screen where this window will be displayed."),
-                                                        GTK_TYPE_WINDOW,
+                                                        GDK_TYPE_SCREEN,
                                                         GTK_PARAM_READWRITE));
 
 }