diff --git a/ChangeLog b/ChangeLog
index 0e85b6a8db..da80a89807 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the
+	model is empty.  Fixes #143536.
+
 2004-06-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0e85b6a8db..da80a89807 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-06-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the
+	model is empty.  Fixes #143536.
+
 2004-06-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0e85b6a8db..da80a89807 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-06-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the
+	model is empty.  Fixes #143536.
+
 2004-06-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0e85b6a8db..da80a89807 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-06-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the
+	model is empty.  Fixes #143536.
+
 2004-06-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 1321c18140..f709820eb6 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12109,7 +12109,8 @@ gtk_tree_view_search_init (GtkWidget   *entry,
   if (len < 1)
     return;
 
-  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,