diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index fd12df3266..67dd10dc6f 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2134,8 +2134,10 @@ gtk_window_buildable_set_buildable_property (GtkBuildable *buildable,
 
   if (strcmp (name, "visible") == 0 && g_value_get_boolean (value))
     priv->builder_visible = TRUE;
-  else
+  else if (parent_buildable_iface->set_buildable_property)
     parent_buildable_iface->set_buildable_property (buildable, builder, name, value);
+  else
+    g_object_set_property (G_OBJECT (buildable), name, value);
 }
 
 typedef struct {