diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 613b5aeae7..72f26e94cd 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -2619,10 +2619,14 @@ gtk_box_set_center_widget (GtkBox    *box,
 
   g_return_if_fail (GTK_IS_BOX (box));
 
+  if (priv->center)
+    {
+      gtk_box_remove (GTK_CONTAINER (box), priv->center->widget);
+      priv->center = NULL;
+    }
+
   if (widget)
     priv->center = gtk_box_pack (box, widget, FALSE, TRUE, 0, GTK_PACK_START);
-  else if (priv->center)
-    gtk_box_remove (GTK_CONTAINER (box), priv->center->widget);
 }
 
 /**