diff --git a/ChangeLog b/ChangeLog
index 3eb4dc1515..16ac7a24ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-28  Derek Atkins  <derek@ihtfp.com>
+
+	* src/gnome-utils/gnc-date-edit.c: hide the calendar popup
+	  on enter/return keypress events (in addition to ESC).
+	Fixes #118500
+
 2003-07-27  Matt Vanecek  <mevanecek@yahoo.com>
 
     * src/backend/postgres/PostgresBackend.c: Added pgendGetBook(),
diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c
index e52107b0be..99af8c9949 100644
--- a/src/gnome-utils/gnc-date-edit.c
+++ b/src/gnome-utils/gnc-date-edit.c
@@ -171,8 +171,10 @@ key_press_popup (GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
 	GNCDateEdit *gde = data;
 
-	if (event->keyval != GDK_Escape)
-		return date_accel_key_press(gde->date_entry, event, data);
+	if (event->keyval != GDK_Return &&
+	    event->keyval != GDK_KP_Enter &&
+	    event->keyval != GDK_Escape)
+	  return date_accel_key_press(gde->date_entry, event, data);
 
 	gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
 	hide_popup (gde);