diff --git a/src/gui/editors/editeventref.py b/src/gui/editors/editeventref.py
index 10e6d2289..736c39dd7 100644
--- a/src/gui/editors/editeventref.py
+++ b/src/gui/editors/editeventref.py
@@ -82,8 +82,9 @@ class EditEventRef(EditReference):
                               _('_General'), tblref)
 
     def _init_event(self):
-        self.commit_event = self.db.commit_personal_event
-        self.add_event = self.db.add_person_event
+        if not self.db.readonly:
+            self.commit_event = self.db.commit_personal_event
+            self.add_event = self.db.add_person_event
 
     def get_custom_events(self):
         return self.db.get_person_event_types()
@@ -257,8 +258,9 @@ class EditFamilyEventRef(EditEventRef):
                               event_ref, update)
         
     def _init_event(self):
-        self.commit_event = self.db.commit_family_event
-        self.add_event = self.db.add_family_event
+        if not self.db.readonly:
+            self.commit_event = self.db.commit_family_event
+            self.add_event = self.db.add_family_event
 
     def get_custom_events(self):
         return [ gen.lib.EventType((gen.lib.EventType.CUSTOM,val)) \
diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py
index e95622ade..a486d6d98 100644
--- a/src/gui/editors/editname.py
+++ b/src/gui/editors/editname.py
@@ -214,7 +214,7 @@ class EditName(EditSecondary):
             self.obj.set_surname,
             self.obj.get_surname,
             self.db.readonly,
-            autolist=self.db.get_surname_list(),
+            autolist=self.db.get_surname_list() if not self.db.readonly else [],
             changed=self.update_group_as)
 
         self.prefix_field = MonitoredEntry(