diff --git a/ChangeLog b/ChangeLog
index 6ccd9b475c..afd850abcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ccd9b475c..afd850abcb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6ccd9b475c..afd850abcb 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6ccd9b475c..afd850abcb 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 907a1b5fab..45c24d13ab 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -537,6 +537,9 @@ gtk_menu_tool_button_set_menu (GtkMenuToolButton *button,
 
   if (priv->menu != GTK_MENU (menu))
     {
+      if (priv->menu && GTK_WIDGET_VISIBLE (priv->menu))
+        gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
+
       if (priv->menu)
         g_object_unref (priv->menu);