diff --git a/ChangeLog b/ChangeLog
index 082730a..add2eb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-31  Lucas Rocha  <lucasr@gnome.org>
+
+	* src/about.c (zenity_about_dialog_response): quit zenity 
+	on dialog response (Fixes bug #336505).
+
 2006-03-23  Lucas Rocha  <lucasr@gnome.org>
 
 	* src/fileselection.c, zenity.h, option.c: add 
diff --git a/src/about.c b/src/about.c
index 2fe95aa..9586d53 100644
--- a/src/about.c
+++ b/src/about.c
@@ -292,7 +292,6 @@ zenity_about_dialog_response (GtkWidget *widget, int response, gpointer data)
   switch (response) {
     case GTK_RESPONSE_CLOSE:
       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-      gtk_main_quit ();
       break;
 
     default:
@@ -300,6 +299,8 @@ zenity_about_dialog_response (GtkWidget *widget, int response, gpointer data)
       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
       break;
   }
+
+  gtk_main_quit ();
 }
 
 static void