diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 6029f8191..15fff96bc 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -214,9 +214,10 @@ class EditPerson:
                                          self.on_web_select_row,
                                          self.on_update_url_clicked)
 
-        self.autoplace = AutoComp.AutoCombo(self.bpcombo,self.pmap.keys())
-        self.autodeath = AutoComp.AutoCombo(self.dpcombo,self.pmap.keys(),
-                                            self.autoplace)
+        place_list = self.pmap.keys()
+        place_list.sort()
+        self.autoplace = AutoComp.AutoCombo(self.bpcombo, place_list)
+        self.autodeath = AutoComp.AutoCombo(self.dpcombo, place_list, self.autoplace)
         self.comp = AutoComp.AutoCombo(self.sncombo,self.db.getSurnames())
             
         self.gid.set_text(person.getId())
diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py
index 65a6b3add..091784fe5 100644
--- a/gramps2/src/Marriage.py
+++ b/gramps2/src/Marriage.py
@@ -174,7 +174,10 @@ class Marriage:
         else:
             self.lds_temple.entry.set_text("")
             self.seal_stat = 0
-        self.autoplace = AutoComp.AutoCombo(self.lds_place,self.pmap.keys())
+
+        place_list = self.pmap.keys()
+        place_list.sort()
+        self.autoplace = AutoComp.AutoCombo(self.lds_place, place_list)
 
         self.build_seal_menu()