diff --git a/ChangeLog b/ChangeLog
index 9739972812..95a6e412ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
+	if the tree is empty.  (#164669, Priit Laes)
+
 Wed Jan 19 18:57:02 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9739972812..95a6e412ac 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
+	if the tree is empty.  (#164669, Priit Laes)
+
 Wed Jan 19 18:57:02 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9739972812..95a6e412ac 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
+	if the tree is empty.  (#164669, Priit Laes)
+
 Wed Jan 19 18:57:02 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 836bd6f196..2f6c5d6276 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12497,7 +12497,8 @@ gtk_tree_view_search_move (GtkWidget   *window,
 
   /* search */
   gtk_tree_selection_unselect_all (selection);
-  gtk_tree_model_get_iter_first (model, &iter);
+  if (!gtk_tree_model_get_iter_first (model, &iter))
+    return;
 
   ret = gtk_tree_view_search_iter (model, selection, &iter, text,
 				   &count, up?((tree_view->priv->selected_iter) - 1):((tree_view->priv->selected_iter + 1)));