diff --git a/gramps/gui/editors/editfamily.py b/gramps/gui/editors/editfamily.py
index 450e73f10..cc3c9a113 100644
--- a/gramps/gui/editors/editfamily.py
+++ b/gramps/gui/editors/editfamily.py
@@ -303,8 +303,10 @@ class ChildEmbedList(EmbeddedList):
                 return name
             if not father:
                 preset_name(mother, name)
+                return name
             if not mother:
                 preset_name(father, name)
+                return name
             #we take first surname, and keep that
             mothername = Name()
             preset_name(mother, mothername)