diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index bb96bfdbe..6abe2e8e1 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-21  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditFamily.py: Don't attempt to be too clever and
+	swap families if a duplicate is found. Just warn, and continue.
+
 2006-06-21  Zsolt Foldvari  <zsolt.foldvari@nokia.com>
 	* src/DisplayTabs/_GalleryTab.py (GalleryTab.build_interface):
 	Properly add icon list.
diff --git a/gramps2/src/Editors/_EditFamily.py b/gramps2/src/Editors/_EditFamily.py
index dbeaeb27f..1cdc20c4b 100644
--- a/gramps2/src/Editors/_EditFamily.py
+++ b/gramps2/src/Editors/_EditFamily.py
@@ -652,16 +652,7 @@ class EditFamily(EditPrimary):
                 mfam = set(mother.get_family_handle_list())
                 common = list(mfam.intersection(ffam))
                 if len(common) > 0:
-                    if self.add_parent:
-                        clist = self.obj.get_child_ref_list()
-                        self.obj = self.dbstate.db.get_family_from_handle(common[0])
-                        self.obj.add_child_ref(clist[0])
-                        self.close()
-                        try:
-                            EditFamily(self.dbstate,self.uistate,[],self.obj)
-                        except Errors.WindowActiveError:
-                            pass
-                    elif self.obj.handle not in common:
+                    if self.add_parent or self.obj.handle not in common:
                         import QuestionDialog
                         QuestionDialog.WarningDialog(
                             _('Duplicate Family'),