diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b9604e32b2..84104e3ac6 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
+
+	* gui/contact-editor/eab-editor.c: (eab_editor_prompt_to_save_changes)
+	(eab_editor_request_close_all) Fixes the bug #309416
+
 2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
 
 	* tools/evolution-addressbook-export-list-cards.c: (output_n_cards_file)
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index 65b985c153..7c0efa0cca 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -269,6 +269,7 @@ eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window)
 			return FALSE;
 		}
 		eab_editor_save_contact (editor, TRUE);
+		eab_editor_close (EAB_EDITOR (editor));
 		return TRUE;
 	case GTK_RESPONSE_NO:
 		eab_editor_close (EAB_EDITOR (editor));
@@ -298,7 +299,6 @@ eab_editor_request_close_all (void)
 			retval = FALSE;
 			break;
 		}
-		eab_editor_close (editor);
 	}
 
 	return retval;