diff --git a/ChangeLog b/ChangeLog
index 3cce244b45..84f28ad145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkuimanager.c (update_node): Update tooltips when 
+	reconnecting toolitems.  (#312173, Alex Graveley)
+
 	* gdk/x11/gdkxftdefaults.c: Define the hint styles to make
 	building against fc < 2.2.92 work.  (#311839, Damien Carbery)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3cce244b45..84f28ad145 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-08-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkuimanager.c (update_node): Update tooltips when 
+	reconnecting toolitems.  (#312173, Alex Graveley)
+
 	* gdk/x11/gdkxftdefaults.c: Define the hint styles to make
 	building against fc < 2.2.92 work.  (#311839, Damien Carbery)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3cce244b45..84f28ad145 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-08-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkuimanager.c (update_node): Update tooltips when 
+	reconnecting toolitems.  (#312173, Alex Graveley)
+
 	* gdk/x11/gdkxftdefaults.c: Define the hint styles to make
 	building against fc < 2.2.92 work.  (#311839, Damien Carbery)
 
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 72a2bde4c8..7823c93d79 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2520,12 +2520,6 @@ update_node (GtkUIManager *self,
 	      
 	      gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
 				  GTK_TOOL_ITEM (info->proxy), pos);
-	      
-	      /* FIXME: we must trigger the notify::tooltip handler, since 
-	       * tooltips on toolitems can't be set before the toolitem 
-	       * is added to the toolbar.
-	       */
-	      g_object_notify (G_OBJECT (action), "tooltip");
 	    }
 	}
       else
@@ -2535,6 +2529,13 @@ update_node (GtkUIManager *self,
 						NULL);
 	  gtk_action_connect_proxy (action, info->proxy);
 	}
+
+      /* FIXME: we must trigger the notify::tooltip handler, since 
+       * tooltips on toolitems can't be set before the toolitem 
+       * is added to the toolbar.
+       */
+      g_object_notify (G_OBJECT (action), "tooltip");
+
       g_signal_connect (info->proxy, "notify::visible",
 			G_CALLBACK (update_smart_separators), NULL);
       break;