diff --git a/ChangeLog b/ChangeLog
index 1b316a6831..e9c338a82d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-26  Christian Persch  <chpe@cvs.gnome.org>
+
+	* gtk/gtkaboutdialog.c: Put initial focus on Close button (#337261).
+
 2006-10-23  Dom Lachowicz <domlachowicz@gmail.com>
 
 	* modules/engines/ms-windows/msw_style.c (draw_expander): Remember
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 7eda3041e4..0c895c41c4 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -431,7 +431,7 @@ static void
 gtk_about_dialog_init (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  GtkWidget *vbox, *hbox, *button, *image;
+  GtkWidget *vbox, *hbox, *button, *close_button, *image;
 
   /* Data */
   priv = GTK_ABOUT_DIALOG_GET_PRIVATE (about);
@@ -496,7 +496,8 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   gtk_widget_show (hbox);
 
   /* Add the OK button */
-  gtk_dialog_add_button (GTK_DIALOG (about), GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL);
+  close_button = gtk_dialog_add_button (GTK_DIALOG (about), GTK_STOCK_CLOSE,
+					GTK_RESPONSE_CANCEL);
   gtk_dialog_set_default_response (GTK_DIALOG (about), GTK_RESPONSE_CANCEL);
 
   /* Add the credits button */
@@ -527,6 +528,9 @@ gtk_about_dialog_init (GtkAboutDialog *about)
 
   gtk_widget_pop_composite_child ();
 
+  gtk_widget_grab_default (close_button);
+  gtk_widget_grab_focus (close_button);
+
   /* force defaults */
   gtk_about_dialog_set_name (about, NULL);
   gtk_about_dialog_set_logo (about, NULL);