diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 737858f4c..d2e6a0f1e 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-16  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditFamiy.py: make EditPerson windows subordinate
+	to EditFamily windows. This prevents the EditPerson window from
+	trying to trying to access a non-existent window and causing a
+	segfault
+
 2006-06-15  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_GrampsDbBase.py: prevent null event types and
 	attribute types from being added
diff --git a/gramps2/src/Editors/_EditFamily.py b/gramps2/src/Editors/_EditFamily.py
index 0281ddb04..f5da43b1e 100644
--- a/gramps2/src/Editors/_EditFamily.py
+++ b/gramps2/src/Editors/_EditFamily.py
@@ -206,7 +206,8 @@ class ChildEmbedList(EmbeddedList):
         person.get_primary_name().set_surname(name[1])
         person.get_primary_name().set_surname_prefix(name[0])
 
-        EditPerson(self.dbstate,self.uistate,[],person, self.new_child_added)
+        EditPerson(self.dbstate, self.uistate, self.track,person,
+                   self.new_child_added)
 
     def new_child_added(self, person):
         ref = RelLib.ChildRef()
@@ -515,13 +516,15 @@ class EditFamily(EditPrimary):
         from Editors import EditPerson
         person = RelLib.Person()
         person.set_gender(RelLib.Person.FEMALE)
-        EditPerson(self.dbstate,self.uistate,[],person, self.new_mother_added)
+        EditPerson(self.dbstate, self.uistate, self.track, person,
+                   self.new_mother_added)
 
     def add_father_clicked(self, obj):
         from Editors import EditPerson
         person = RelLib.Person()
         person.set_gender(RelLib.Person.MALE)
-        EditPerson(self.dbstate,self.uistate,[],person, self.new_father_added)
+        EditPerson(self.dbstate, self.uistate, self.track,
+                   person, self.new_father_added)
 
     def new_mother_added(self, person):
         self.obj.set_mother_handle(person.handle) 
@@ -658,7 +661,7 @@ class EditFamily(EditPrimary):
             try:
                 person = self.db.get_person_from_handle(handle)
                 EditPerson(self.dbstate, self.uistate,
-                                      self.track, person)
+                           self.track, person)
             except Errors.WindowActiveError:
                 pass