diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 6bedc86e99..0154dd22fa 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1057,6 +1057,12 @@ gtk_container_destroy (GtkObject *object)
   if (GTK_CONTAINER_RESIZE_PENDING (container))
     _gtk_container_dequeue_resize_handler (container);
 
+  if (container->focus_child)
+    {
+      g_object_unref (container->focus_child);
+      container->focus_child = NULL;
+    }
+
   /* do this before walking child widgets, to avoid
    * removing children from focus chain one by one.
    */