diff --git a/ChangeLog b/ChangeLog
index 477a72bf19a37660b8a8ffe04d4224674b894b57..847cd4f1f03a608d1ebd7a7cfdb8a58761f74ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-08-09 jeromeg
 
+Make enter validate the ZimageZ dialog.
+
+2009-08-09 jeromeg
+
 Use sd->title as a title in the ZimageZ information.
 
 2009-08-08 jeromeg
diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c
index 28005ea5bfb4814f4c2b7023c73ddfad39bac339..c5068698df50af078ab7ca4314c0f5743d7e4baf 100644
--- a/lib/screenshooter-zimagez.c
+++ b/lib/screenshooter-zimagez.c
@@ -730,6 +730,7 @@ cb_ask_for_information (ScreenshooterJob *job,
   gtk_widget_set_tooltip_text (user_entry,
                                _("Your Zimagez user name, if you do not have one yet"
                                  " please create one on the Web page linked above"));
+  gtk_entry_set_activates_default (GTK_ENTRY (user_entry), TRUE);
   gtk_table_attach_defaults (GTK_TABLE (table), user_entry, 1, 2, 0, 1);
 
   /* Create the password label */
@@ -745,6 +746,7 @@ cb_ask_for_information (ScreenshooterJob *job,
   password_entry = gtk_entry_new ();
   gtk_widget_set_tooltip_text (password_entry, _("The password for the user above"));
   gtk_entry_set_visibility (GTK_ENTRY (password_entry), FALSE);
+  gtk_entry_set_activates_default (GTK_ENTRY (password_entry), TRUE);
   gtk_table_attach_defaults (GTK_TABLE (table), password_entry, 1, 2, 1, 2);
 
   /* Create the title label */
@@ -760,6 +762,7 @@ cb_ask_for_information (ScreenshooterJob *job,
   gtk_widget_set_tooltip_text (title_entry,
                                _("The title of the screenshot, it will be used when"
                                  " displaying the screenshot on ZimageZ"));
+  gtk_entry_set_activates_default (GTK_ENTRY (title_entry), TRUE);
   gtk_table_attach_defaults (GTK_TABLE (table), title_entry, 1, 2, 2, 3);
 
   /* Create the comment label */
@@ -776,6 +779,7 @@ cb_ask_for_information (ScreenshooterJob *job,
   gtk_widget_set_tooltip_text (title_entry,
                                _("A comment on the screenshot, it will be used when"
                                  " displaying the screenshot on ZimageZ"));
+  gtk_entry_set_activates_default (GTK_ENTRY (comment_entry), TRUE);
   gtk_table_attach_defaults (GTK_TABLE (table), comment_entry, 1, 2, 3, 4);
 
   /* Set the values */