diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3d8c0079d..ed828c992 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-26  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/_MediaView.py: fix accelerator entries
+	* src/DataViews/_RepositoryView.py: fix accelerator entries
+	* src/DataViews/_SourceView.py: fix accelerator entries
+	* src/DataViews/_EventView.py: fix accelerator entries
+	* src/DataViews/_FamilyList.py: fix accelerator entries
+	* src/DataViews/_PlaceView.py: fix accelerator entries
+	* src/DataViews/_PersonView.py: fix accelerator entries
+	* src/ViewManager.py: fix accelerator entries
+	* src/PageView.py: fix accelerator entries
+	
 2007-01-26 Richard Taylor  <rjt-gramps@thegrindstone.me.uk>
 	* src/ObjectSelector/_FilterFrameBase.py: wrap in EventBox so 
 	that clipping work properly.
diff --git a/gramps2/src/DataViews/_EventView.py b/gramps2/src/DataViews/_EventView.py
index 985d93501..4750b770f 100644
--- a/gramps2/src/DataViews/_EventView.py
+++ b/gramps2/src/DataViews/_EventView.py
@@ -88,8 +88,6 @@ class EventView(PageView.ListView):
 
         self.func_list = {
             '<CONTROL>J' : self.jump,
-            '<CONTROL>Insert' : self.key_insert,
-            '<CONTROL>Delete' : self.key_delete,
             '<CONTROL>BackSpace' : self.key_delete,
             }
 
diff --git a/gramps2/src/DataViews/_FamilyList.py b/gramps2/src/DataViews/_FamilyList.py
index 8b867b4eb..274821cae 100644
--- a/gramps2/src/DataViews/_FamilyList.py
+++ b/gramps2/src/DataViews/_FamilyList.py
@@ -78,8 +78,6 @@ class FamilyListView(PageView.ListView):
 
         self.func_list = {
             '<CONTROL>J' : self.jump,
-            '<CONTROL>Insert' : self.key_insert,
-            '<CONTROL>Delete' : self.key_delete,
             '<CONTROL>BackSpace' : self.key_delete,
             }
 
diff --git a/gramps2/src/DataViews/_MediaView.py b/gramps2/src/DataViews/_MediaView.py
index ecec1c953..0f9327001 100644
--- a/gramps2/src/DataViews/_MediaView.py
+++ b/gramps2/src/DataViews/_MediaView.py
@@ -104,8 +104,6 @@ class MediaView(PageView.ListView):
 
         self.func_list = {
             '<CONTROL>J' : self.jump,
-            '<CONTROL>Insert' : self.key_insert,
-            '<CONTROL>Delete' : self.key_delete,
             '<CONTROL>BackSpace' : self.key_delete,
             }
 
diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py
index 433517a03..4a1cf7b10 100644
--- a/gramps2/src/DataViews/_PersonView.py
+++ b/gramps2/src/DataViews/_PersonView.py
@@ -103,9 +103,7 @@ class PersonView(PageView.PersonNavView):
         self.func_list = {
             'F2' : self.key_goto_home_person,
             'F3' : self.key_edit_selected_person,
-            '<CONTROL>Delete' : self.key_delete_selected_person,
             '<CONTROL>BackSpace' : self.key_delete_selected_person,
-            '<CONTROL>Insert' : self.key_add_new_person,
             '<CONTROL>J' : self.jump,
             }
         self.dirty = True
@@ -159,9 +157,9 @@ class PersonView(PageView.PersonNavView):
 
         self.edit_action.add_actions(
             [
-                ('Add', gtk.STOCK_ADD, _("_Add"), None, _("Add a new person"), 
-                 self.add),
-                ('Remove', gtk.STOCK_REMOVE, _("_Remove"), None, 
+                ('Add', gtk.STOCK_ADD, _("_Add"), "<control>Insert", 
+		 _("Add a new person"), self.add),
+                ('Remove', gtk.STOCK_REMOVE, _("_Remove"), "<control>Delete", 
                  _("Remove the selected person"), self.remove),
                 ('ColumnEdit', gtk.STOCK_PROPERTIES, _('_Column Editor'), None, 
                  None, self.column_editor),
@@ -866,12 +864,9 @@ class PersonView(PageView.PersonNavView):
         self.uistate.push_message(self.dbstate,
                                   _("Edit selected person"))
 
+
     def key_delete_selected_person(self):
         self.remove(None)
         self.uistate.push_message(self.dbstate,
                                   _("Delete selected person"))
 
-    def key_add_new_person(self):
-        self.add(None)
-        self.uistate.push_message(self.dbstate,
-                                  _("Add new person"))
diff --git a/gramps2/src/DataViews/_PlaceView.py b/gramps2/src/DataViews/_PlaceView.py
index a0de3110e..b7a3b33e8 100644
--- a/gramps2/src/DataViews/_PlaceView.py
+++ b/gramps2/src/DataViews/_PlaceView.py
@@ -95,8 +95,6 @@ class PlaceView(PageView.ListView):
 
         self.func_list = {
             '<CONTROL>J' : self.jump,
-            '<CONTROL>Insert' : self.key_insert,
-            '<CONTROL>Delete' : self.key_delete,
             '<CONTROL>BackSpace' : self.key_delete,
             }
 
diff --git a/gramps2/src/DataViews/_RepositoryView.py b/gramps2/src/DataViews/_RepositoryView.py
index 063d3dd5e..8ec026d54 100644
--- a/gramps2/src/DataViews/_RepositoryView.py
+++ b/gramps2/src/DataViews/_RepositoryView.py
@@ -96,8 +96,6 @@ class RepositoryView(PageView.ListView):
         
         self.func_list = {
             '<CONTROL>J' : self.jump,
-            '<CONTROL>Insert' : self.key_insert,
-            '<CONTROL>Delete' : self.key_delete,
             '<CONTROL>BackSpace' : self.key_delete,
             }
 
diff --git a/gramps2/src/DataViews/_SourceView.py b/gramps2/src/DataViews/_SourceView.py
index ae0da4773..9e2944de1 100644
--- a/gramps2/src/DataViews/_SourceView.py
+++ b/gramps2/src/DataViews/_SourceView.py
@@ -89,8 +89,6 @@ class SourceView(PageView.ListView):
 
         self.func_list = {
             '<CONTROL>J' : self.jump,
-            '<CONTROL>Insert' : self.key_insert,
-            '<CONTROL>Delete' : self.key_delete,
             '<CONTROL>BackSpace' : self.key_delete,
             }
 
diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py
index 9524f5c43..c1cc37695 100644
--- a/gramps2/src/PageView.py
+++ b/gramps2/src/PageView.py
@@ -802,9 +802,12 @@ class ListView(BookMarkView):
 
         self.edit_action = gtk.ActionGroup(self.title + '/ChangeOrder')
         self.edit_action.add_actions([
-                ('Add', gtk.STOCK_ADD, _("_Add"), None, self.ADD_MSG, self.add),
-                ('Remove', gtk.STOCK_REMOVE, _("_Remove"), None, self.DEL_MSG, self.remove),
-                ('ColumnEdit', gtk.STOCK_PROPERTIES, _('_Column Editor'), None, None, self.column_editor),
+                ('Add', gtk.STOCK_ADD, _("_Add"), "<control>Insert", 
+		 self.ADD_MSG, self.add),
+                ('Remove', gtk.STOCK_REMOVE, _("_Remove"), "<control>Delete", 
+		 self.DEL_MSG, self.remove),
+                ('ColumnEdit', gtk.STOCK_PROPERTIES, _('_Column Editor'), 
+		 None, None, self.column_editor),
                 ])
 
         self.add_action_group(self.edit_action)
@@ -845,5 +848,3 @@ class ListView(BookMarkView):
     def key_delete(self):
         self.remove(None)
 
-    def key_insert(self):
-        self.add(None)
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index f3401d249..08cea323b 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -178,8 +178,6 @@ uidefault = '''<ui>
 <accelerator action="F9"/>
 <accelerator action="F11"/>
 <accelerator action="F12"/>
-<accelerator action="<CONTROL>Delete"/>
-<accelerator action="<CONTROL>Insert"/>
 <accelerator action="<CONTROL>BackSpace"/>
 <accelerator action="<CONTROL>J"/>
 <accelerator action="<Alt>N"/>