diff --git a/src/gui/editors/editfamily.py b/src/gui/editors/editfamily.py
index 7c2a1c79f..3c2083dae 100644
--- a/src/gui/editors/editfamily.py
+++ b/src/gui/editors/editfamily.py
@@ -292,8 +292,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 = gen.lib.Name()
             preset_name(mother, mothername)