diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 4b49bc910..0dd631723 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -5,7 +5,8 @@
 2005-09-16  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* Makefile.am: Disable install, show warning instead.
 	* src/PageView.py (button_press): Catch problem with no loaded database
-	* src/PersonView.py (button_press): Catch problem with no loaded database
+	* src/PersonView.py (button_press): Catch problem with no loaded
+	database; (edit): Work with missing active person
 	* src/GrampsDbBase.py (_get_from_handle): Catch problem with no loaded database
 	* src/MapView.py: Updates
 	* src/EditPerson.py: Change complete flag into marker combo
diff --git a/gramps2/src/PersonView.py b/gramps2/src/PersonView.py
index 916be2199..05d453d2a 100644
--- a/gramps2/src/PersonView.py
+++ b/gramps2/src/PersonView.py
@@ -451,7 +451,8 @@ class PersonView(PageView.PersonNavView):
         EditPerson.EditPerson(self.dbstate, self.uistate, person)
 
     def edit(self,obj):
-        EditPerson.EditPerson(self.dbstate, self.uistate, self.dbstate.active)
+        if self.dbstate.active:
+            EditPerson.EditPerson(self.dbstate, self.uistate, self.dbstate.active)
 
     def remove(self,obj):
         mlist = self.get_selected_objects()