diff --git a/ChangeLog b/ChangeLog
index ee4345575..c9880005f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-18  Douglas S. Blank  <dblank@cs.brynmawr.edu>
+	* src/Editors/_EditFamily.py: doubleclick now edits; fixed share popup
+	* src/DisplayTabs/_EmbeddedList.py: fixed share popup
+	* src/DisplayTabs/_GalleryTab.py: fixed share popup
+
 2007-12-18 Gary Burton <gary.burton@zen.co.uk>
 	* src/plugins/DetAncestralReport.py: Remove some test code
 
diff --git a/src/DisplayTabs/_EmbeddedList.py b/src/DisplayTabs/_EmbeddedList.py
index d9606bb8a..acfa548a2 100644
--- a/src/DisplayTabs/_EmbeddedList.py
+++ b/src/DisplayTabs/_EmbeddedList.py
@@ -99,7 +99,7 @@ class EmbeddedList(ButtonTab):
         if self.share_btn:
             itemlist = [
                 (True, True, gtk.STOCK_ADD, self.add_button_clicked),
-                (True, False, _('Share'), self.edit_button_clicked),
+                (True, False, _('Share'), self.share_button_clicked),
                 (False,True, gtk.STOCK_EDIT, self.edit_button_clicked),
                 (True, True, gtk.STOCK_REMOVE, self.del_button_clicked),
                 ]
diff --git a/src/DisplayTabs/_GalleryTab.py b/src/DisplayTabs/_GalleryTab.py
index a901d0f1a..de9c04ca8 100644
--- a/src/DisplayTabs/_GalleryTab.py
+++ b/src/DisplayTabs/_GalleryTab.py
@@ -101,7 +101,7 @@ class GalleryTab(ButtonTab):
     def right_click(self, obj, event):
         itemlist = [
             (True, True, gtk.STOCK_ADD, self.add_button_clicked), 
-            (True, False, _('Share'), self.edit_button_clicked), 
+            (True, False, _('Share'), self.share_button_clicked), 
             (False,True, gtk.STOCK_EDIT, self.edit_button_clicked), 
             (True, True, gtk.STOCK_REMOVE, self.del_button_clicked), 
             ]
diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py
index 82c9f2940..9b9267365 100644
--- a/src/Editors/_EditFamily.py
+++ b/src/Editors/_EditFamily.py
@@ -85,7 +85,7 @@ class ChildEmbedList(EmbeddedList):
     _MSG = {
         'add'   : _('Create a new person and add the child to the family'),
         'del'   : _('Remove the child from the family'),
-        'edit'  : _('Edit the child/family relationship'),
+        'edit'  : _('Edit the child'),
         'share' : _('Add an existing person as a child of the family'),
         'up'	: _('Move the child up in the childrens list'),
         'down'	: _('Move the child down in the childrens list'),
@@ -115,9 +115,9 @@ class ChildEmbedList(EmbeddedList):
     def get_popup_menu_items(self):
         return [
             (True, True, gtk.STOCK_ADD, self.add_button_clicked),
-            (True, False, _('Share'), self.edit_button_clicked),
-            (False,True,  _('Edit relationship'), self.edit_button_clicked),
-            (False,True,  _('Edit child'), self.edit_child_button_clicked),
+            (True, False, _('Add an existing child'), self.share_button_clicked),
+            (False,True,  _('Edit relationship'), self.edit_relation_button_clicked),
+            (False,True,  _('Edit child'), self.edit_button_clicked),
             (True, True, gtk.STOCK_REMOVE, self.del_button_clicked),
             ]
 
@@ -253,7 +253,7 @@ class ChildEmbedList(EmbeddedList):
                     self.family.remove_child_ref(ref)
             self.rebuild()
 
-    def edit_button_clicked(self,obj):
+    def edit_relation_button_clicked(self,obj):
         handle = self.get_selected()
         if handle:
             from Editors import EditChildRef
@@ -269,7 +269,7 @@ class ChildEmbedList(EmbeddedList):
                         pass
                     break
 
-    def edit_child_button_clicked(self, obj):
+    def edit_button_clicked(self, obj):
         handle = self.get_selected()
         if handle:
             from Editors import EditPerson