diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3404a9edb..334d4d791 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2006-06-17  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditPerson.py: select given name field if the
+	surname field is already defined
 	* src/Selectors/_BaseSelector.py (BaseSelector.run): handle
 	delete event
 	* src/DataViews/_RelationView.py: remove debug statement
diff --git a/gramps2/src/Editors/_EditPerson.py b/gramps2/src/Editors/_EditPerson.py
index 46b39d962..df867c057 100644
--- a/gramps2/src/Editors/_EditPerson.py
+++ b/gramps2/src/Editors/_EditPerson.py
@@ -135,7 +135,10 @@ class EditPerson(EditPrimary):
         class (this class)
         """
         self.load_person_image()
-        self.surname_field.grab_focus()
+        if self.pname.get_surname() and not self.pname.get_first_name():
+            self.given.grab_focus()
+        else:
+            self.surname_field.grab_focus()
 
 #         if not Config.get(Config.HIDE_EP_MSG):
 #             MessageHideDialog(