diff --git a/ChangeLog b/ChangeLog
index d7df7e09e3..6157bd99d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-30  Not Zed  <NotZed@Ximian.com>
+
+	Fixes #132929.
+
+	* gtk/gtktreeview.c (cancel_arrow_animation): remove the timeout
+	handler when we clear the timeout id.
+
 2004-01-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #129872, based on a patch by Jan Arne Petersen
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d7df7e09e3..6157bd99d6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-01-30  Not Zed  <NotZed@Ximian.com>
+
+	Fixes #132929.
+
+	* gtk/gtktreeview.c (cancel_arrow_animation): remove the timeout
+	handler when we clear the timeout id.
+
 2004-01-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #129872, based on a patch by Jan Arne Petersen
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d7df7e09e3..6157bd99d6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2004-01-30  Not Zed  <NotZed@Ximian.com>
+
+	Fixes #132929.
+
+	* gtk/gtktreeview.c (cancel_arrow_animation): remove the timeout
+	handler when we clear the timeout id.
+
 2004-01-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #129872, based on a patch by Jan Arne Petersen
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d7df7e09e3..6157bd99d6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-01-30  Not Zed  <NotZed@Ximian.com>
+
+	Fixes #132929.
+
+	* gtk/gtktreeview.c (cancel_arrow_animation): remove the timeout
+	handler when we clear the timeout id.
+
 2004-01-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #129872, based on a patch by Jan Arne Petersen
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d7df7e09e3..6157bd99d6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-01-30  Not Zed  <NotZed@Ximian.com>
+
+	Fixes #132929.
+
+	* gtk/gtktreeview.c (cancel_arrow_animation): remove the timeout
+	handler when we clear the timeout id.
+
 2004-01-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #129872, based on a patch by Jan Arne Petersen
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 271fc41b95..75b42f6bbd 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6891,8 +6891,12 @@ static void
 cancel_arrow_animation (GtkTreeView *tree_view)
 {
   if (tree_view->priv->expand_collapse_timeout)
-    while (do_expand_collapse (tree_view));
-  tree_view->priv->expand_collapse_timeout = 0;
+    {
+      while (do_expand_collapse (tree_view));
+
+      g_source_remove (tree_view->priv->expand_collapse_timeout);
+      tree_view->priv->expand_collapse_timeout = 0;
+    }
 }
 
 static void