diff --git a/ChangeLog b/ChangeLog
index 098cd2c27..48e5df1b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-02-11 Brian Matherly <brian@gramps-project.org>
+	* src/Editors/_EditNote.py: Fix saving notes without marker being set.
+
 2008-02-11 Benny Malengier <benny.malengier@gramps-project.org>
 	* src/plugins/MediaManager.py: conversion functions of path
 	* src/Utils.py: general methods to convert abs to rel
diff --git a/src/Editors/_EditNote.py b/src/Editors/_EditNote.py
index 48be012c1..e7a6e7930 100644
--- a/src/Editors/_EditNote.py
+++ b/src/Editors/_EditNote.py
@@ -484,6 +484,9 @@ class EditNote(EditPrimary):
     def save(self, *obj):
         """Save the data."""
         self.ok_button.set_sensitive(False)
+        
+        self.update_note()
+        
         if self.object_is_empty():
             ErrorDialog(_("Cannot save note"), 
                         _("No data exists for this note. Please "
@@ -505,8 +508,6 @@ class EditNote(EditPrimary):
         
         trans = self.db.transaction_begin()
 
-        self.update_note()
-
         if not self.obj.get_handle():
             self.db.add_note(self.obj, trans)
             msg = _("Add Note")