diff --git a/ChangeLog b/ChangeLog
index 0e2b4de68..d196db349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2006-12-15  Don Allingham  <don@gramps-project.org>
+	* src/GrampsWidgets.py (PlaceEntry.set_button): fix tooltips (bug #764)
+	* src/glade/gramps.glade: remove static tooltip
 	* src/GrampsDb/_ReadGedcom.py (import2): import a readonly file properly (bug #765)
 
 2006-12-15  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py
index 9012423fb..dc62282d7 100644
--- a/src/GrampsWidgets.py
+++ b/src/GrampsWidgets.py
@@ -638,6 +638,7 @@ class PlaceEntry:
             image.set_from_stock(gtk.STOCK_EDIT,gtk.ICON_SIZE_BUTTON)
             image.show()
             self.share.add(image)
+            self.tooltips.set_tip(self.share, _('Edit place'))
             self.tooltips.set_tip(self.add_del, _('Remove place'))
         else:
             image = gtk.Image()
@@ -648,4 +649,5 @@ class PlaceEntry:
             image.set_from_stock(gtk.STOCK_INDEX,gtk.ICON_SIZE_BUTTON)
             image.show()
             self.share.add(image)
+            self.tooltips.set_tip(self.share, _('Select an existing place'))
             self.tooltips.set_tip(self.add_del, _('Add a new place'))
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index d8c436535..f672bb569 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -7079,7 +7079,6 @@
 		  <child>
 		    <widget class="GtkButton" id="select_place">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Select an existing place</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>
@@ -10828,7 +10827,6 @@
 		      <child>
 			<widget class="GtkButton" id="share_place">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Select an existing place</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NONE</property>
 			  <property name="focus_on_click">True</property>