diff --git a/ChangeLog b/ChangeLog
index 69e127d3e..7d34f3b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-04  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs/_EventEmbedList.py: catch attempt to multiply
+	edit an event through events and event references
+
+2006-10-03  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditFamily.py: don't try to change families if the
+	parents don't exist
+
 2006-10-03  Jerome Rapinat  <romjerome@yahoo.fr>
 	* src/plugins/ChangeNames.py: fix path name
 
diff --git a/src/DisplayTabs/_EventEmbedList.py b/src/DisplayTabs/_EventEmbedList.py
index 9f8e517a5..c44c4c86c 100644
--- a/src/DisplayTabs/_EventEmbedList.py
+++ b/src/DisplayTabs/_EventEmbedList.py
@@ -137,7 +137,15 @@ class EventEmbedList(EmbeddedList):
                     self.dbstate, self.uistate, self.track,
                     event, ref, self.event_updated)
             except Errors.WindowActiveError:
-                pass
+                from QuestionDialog import WarningDialog
+                WarningDialog(
+                    _("Cannot edit this reference"),
+                    _("This event reference cannot be edited at this time. "
+                      "Either the associated event is already being edited "
+                      "or another event reference that is associated with "
+                      "the same event is being edited.\n\nTo edit this event "
+                      "reference, you need to close the event.")
+                    )
 
     def event_updated(self, ref, event):
         self.changed = True