diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index e2b6fb246..14b2533c0 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,13 @@
 2007-01-27  Don Allingham  <don@gramps-project.org>
-	* src/ViewManager.py: block interface on autobackup (#856)
+	* src/DataViews/_PersonView.py: add enter to collapse row as well
+
+2007-01-27  Benny Malengier  <benny.malengier@ugent.be>
+	* src/DataViews/_PersonView.py: add enter to expand a tree row
+	
+2007-01-27  Don Allingham  <don@gramps-project.org>
+	* src/PageView.py: add key accelerators
+	* src/ViewManager.py: block interface on autobackup (#856), add key
+	accelerators
 	* src/DisplayState.py: block interface on autobackup
 	* src/Utils.py: handle missing/invalid encoding
 	* src/DisplayModels/_BaseModel.py: handle None vs. 0
diff --git a/gramps2/help/C/gramps.xml b/gramps2/help/C/gramps.xml
index a57d3f2f6..41aa0dd19 100644
--- a/gramps2/help/C/gramps.xml
+++ b/gramps2/help/C/gramps.xml
@@ -6876,6 +6876,22 @@
 		<entry><para><keycap>&lt;Alt&gt;P</keycap></para></entry>
 		<entry>Changes the view to the previous view</entry>
 	      </row>
+              <row valign="top">
+		<entry><para><keycap>&lt;Ctrl&gt;D</keycap></para></entry>
+		<entry>Add the selected item as a bookmark</entry>
+	      </row>
+              <row valign="top">
+		<entry><para><keycap>&lt;Ctrl&gt;B</keycap></para></entry>
+		<entry>Edit the bookmarks</entry>
+	      </row>
+              <row valign="top">
+		<entry><para><keycap>&lt;Alt&gt;S</keycap></para></entry>
+		<entry>Open the Scratch Pad</entry>
+	      </row>
+              <row valign="top">
+		<entry><para><keycap>&lt;Alt&gt;H</keycap></para></entry>
+		<entry>Open the Undo History dialog</entry>
+	      </row>
             </tbody>
           </tgroup>
 	</informaltable>
@@ -6896,12 +6912,16 @@
 
             <tbody>
               <row valign="top">
-		<entry><para><keycap>F2</keycap></para></entry>
-		<entry><para>Set the active person to the default person</para></entry>
-              </row>
+		<entry><para><keycap>&lt;Ctrl&gt;Enter</keycap></para></entry>
+		<entry>Edits the selected person</entry>
+	      </row>
               <row valign="top">
-		<entry><para><keycap>F3</keycap></para></entry>
-		<entry>Edit the active person</entry>
+		<entry><para><keycap>&lt;Ctrl&gt;Insert</keycap></para></entry>
+		<entry>Adds a new person to the database</entry>
+	      </row>
+              <row valign="top">
+		<entry><para><keycap>&lt;Ctrl&gt;Delete</keycap></para></entry>
+		<entry>Deletes the selected person</entry>
 	      </row>
             </tbody>
           </tgroup>
diff --git a/gramps2/help/ChangeLog b/gramps2/help/ChangeLog
index 4173b66ec..5b3daa9d9 100644
--- a/gramps2/help/ChangeLog
+++ b/gramps2/help/ChangeLog
@@ -1,8 +1,10 @@
+2007-01-27  Don Allingham  <don@gramps-project.org>
+	* C/gramps.xml: add more keybindings
+
 2007-01-09  Martin Hawlisch <martin.hawlisch@gmx.de>
 	* C/gramps.xml: Correct Pedigree behaviour.
 
 2006-12-30  Don Allingham  <don@gramps-project.org>
-
 	* C/gramps.xml: start the rework of the key binding sections
 
 2006-12-21  Lubo Vasko  <pgval@inMail.sk>
diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py
index 4a1cf7b10..62f1570c2 100644
--- a/gramps2/src/DataViews/_PersonView.py
+++ b/gramps2/src/DataViews/_PersonView.py
@@ -149,7 +149,7 @@ class PersonView(PageView.PersonNavView):
         self.all_action.add_actions([
                 ('OpenAllNodes', None, _("Expand all nodes"), None, None, 
                  self.open_all_nodes),
-                ('Edit', gtk.STOCK_EDIT, _("_Edit"), None, 
+                ('Edit', gtk.STOCK_EDIT, _("_Edit"), "<control>Return", 
                  _("Edit the selected person"), self.edit),
                 ('CloseAllNodes', None, _("Collapse all nodes"), None, None, 
                  self.close_all_nodes),
@@ -854,6 +854,22 @@ class PersonView(PageView.PersonNavView):
                 return True
         return False
 
+    def key_press(self,obj,event):
+        if not event.state:
+            if event.keyval in (gtk.keysyms.Return, gtk.keysyms.KP_Enter):
+                if self.dbstate.active:
+                    self.edit(obj)
+                    return True
+                else:
+                    store, paths = self.selection.get_selected_rows()
+                    if paths and len(paths[0]) == 1 :
+                        if self.tree.row_expanded(paths[0]):
+                            self.tree.collapse_row(paths[0])
+                        else:
+                            self.tree.expand_row(paths[0], 0)
+                        return True
+        return False
+
     def key_goto_home_person(self):
         self.home(None)
         self.uistate.push_message(self.dbstate,
diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py
index df66a9ad7..7d6ccd004 100644
--- a/gramps2/src/PageView.py
+++ b/gramps2/src/PageView.py
@@ -291,7 +291,8 @@ class PersonNavView(BookMarkView):
              self.back_clicked)
             ])
 
-        self.add_action('HomePerson', gtk.STOCK_HOME, _("_Home"),
+        self.add_action('HomePerson', gtk.STOCK_HOME, _("_Home"), 
+                        accel="<Alt>Home",
                         tip=_("Go to the default person"), callback=self.home)
         self.add_action('FilterEdit',  None, _('Person Filter Editor'), 
                         callback=self.filter_editor)
@@ -813,7 +814,9 @@ class ListView(BookMarkView):
 
         self.add_action_group(self.edit_action)
 
-        self.add_action('Edit', gtk.STOCK_EDIT,_("_Edit"), tip=self.EDIT_MSG,
+        self.add_action('Edit', gtk.STOCK_EDIT, _("_Edit"), 
+                        accel="<control>Return",
+                        tip=self.EDIT_MSG,
                         callback=self.edit)
         
         self.add_toggle_action('Filter', None, _('_Filter'),
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index 146a56991..59d8f171e 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -379,7 +379,7 @@ class ViewManager:
             ]
 
         self._action_action_list = [
-            ('ScratchPad', gtk.STOCK_PASTE, _('_ScratchPad'), "",
+            ('ScratchPad', gtk.STOCK_PASTE, _('_ScratchPad'), "<alt>s",
              _("Open the ScratchPad dialog"), self.scratchpad), 
             ('Import', gtk.STOCK_CONVERT, _('_Import'), "<control>i", None,
              self.import_data), 
@@ -411,7 +411,7 @@ class ViewManager:
 
         self._undo_history_action_list = [
             ('UndoHistory', 'gramps-undo-history',
-             _('Undo History'), None, None, self.undo_history),
+             _('Undo History'), "<Alt>H", None, self.undo_history),
             ]
 
         self._navigation_type = {