diff --git a/ChangeLog b/ChangeLog
index 36236c8c1..1f67ce14d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Gary Burton <gary.burton@zen.co.uk>
+	* src/DisplayTabs/_EmbeddedList.py:
+	* src/DisplayTabs/_ButtonTab.py:
+	ENTER is edit on embedded lists, issue #1296
+
 2007-10-18  Douglas S. Blank  <dblank@cs.brynmawr.edu>
 	* src/BasicUtils/_NameDisplay.py: bug in making patterns with uppercase
 
diff --git a/src/DisplayTabs/_ButtonTab.py b/src/DisplayTabs/_ButtonTab.py
index cbec7def7..c44260e38 100644
--- a/src/DisplayTabs/_ButtonTab.py
+++ b/src/DisplayTabs/_ButtonTab.py
@@ -43,6 +43,9 @@ from GrampsWidgets import SimpleButton
 from _GrampsTab import GrampsTab
 import Errors
 
+_KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")
+_RETURN = gtk.gdk.keyval_from_name("Return")
+
 #-------------------------------------------------------------------------
 #
 # Classes
@@ -164,6 +167,18 @@ class ButtonTab(GrampsTab):
             except Errors.WindowActiveError:
                 pass
 
+    def key_pressed(self, obj, event):
+        """
+        Handles the return key being pressed on list. If the key is pressed,
+        the Edit button handler is called
+        """
+        if event.type == gtk.gdk.KEY_PRESS and \
+            event.keyval in (_RETURN, _KP_ENTER):
+            try:
+                self.edit_button_clicked(obj)
+            except Errors.WindowActiveError:
+                pass
+
     def add_button_clicked(self, obj):
         """
         Function called with the Add button is clicked. This function
diff --git a/src/DisplayTabs/_EmbeddedList.py b/src/DisplayTabs/_EmbeddedList.py
index 5f69c289e..10ad7f19c 100644
--- a/src/DisplayTabs/_EmbeddedList.py
+++ b/src/DisplayTabs/_EmbeddedList.py
@@ -311,6 +311,7 @@ class EmbeddedList(ButtonTab):
         self.tree.set_reorderable(True)
         self.tree.set_rules_hint(True)
         self.tree.connect('button_press_event', self.double_click)
+        self.tree.connect('key_press_event', self.key_pressed)
 
         # create the scrolled window, and attach the treeview
         scroll = gtk.ScrolledWindow()