diff --git a/ChangeLog b/ChangeLog
index 6ed331da48..413cec55dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-06  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_search_entry): fix compiler
+	warning.
+
 2006-02-05  Dom Lachowicz <cinamod@hotmail.com>
 
 	* gdk/gdkcairo.c (gdk_cairo_set_source_pixbuf): Bug #330022
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ed331da48..413cec55dc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-06  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_get_search_entry): fix compiler
+	warning.
+
 2006-02-05  Dom Lachowicz <cinamod@hotmail.com>
 
 	* gdk/gdkcairo.c (gdk_cairo_set_source_pixbuf): Bug #330022
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 03a2503266..f2994684aa 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12582,7 +12582,7 @@ gtk_tree_view_get_search_entry (GtkTreeView *tree_view)
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
 
   if (tree_view->priv->search_custom_entry_set)
-    return tree_view->priv->search_entry;
+    return GTK_ENTRY (tree_view->priv->search_entry);
 
   return NULL;
 }