diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 867d82fa55..7e068c40c1 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -1049,6 +1049,9 @@ gtk_font_button_clicked (GtkButton *button)
 
       g_signal_connect (font_dialog, "destroy",
                         G_CALLBACK (dialog_destroy), font_button);
+
+      g_signal_connect (font_dialog, "delete-event",
+                        G_CALLBACK (gtk_widget_hide_on_delete), NULL);
     }
   
   if (!gtk_widget_get_visible (font_button->priv->font_dialog))