diff --git a/ChangeLog b/ChangeLog
index 99ac007cd2..8ff4dd9ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 26 23:58:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash
+	if model is not set. Noted by Mariano Suarez-Alvarez.
+
 Thu Aug 26 22:44:12 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Provide information about how an adjustment change in a range 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 99ac007cd2..8ff4dd9ba2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Aug 26 23:58:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash
+	if model is not set. Noted by Mariano Suarez-Alvarez.
+
 Thu Aug 26 22:44:12 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Provide information about how an adjustment change in a range 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 99ac007cd2..8ff4dd9ba2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Aug 26 23:58:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash
+	if model is not set. Noted by Mariano Suarez-Alvarez.
+
 Thu Aug 26 22:44:12 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Provide information about how an adjustment change in a range 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 99ac007cd2..8ff4dd9ba2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Aug 26 23:58:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash
+	if model is not set. Noted by Mariano Suarez-Alvarez.
+
 Thu Aug 26 22:44:12 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Provide information about how an adjustment change in a range 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 8879a5e729..0636b94883 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3305,6 +3305,9 @@ gtk_combo_box_key_press (GtkWidget   *widget,
   GtkTreeIter iter;
   GtkTreeIter new_iter;
 
+  if (combo_box->priv->model == NULL)
+    return FALSE;
+
   if ((event->keyval == GDK_Down || event->keyval == GDK_KP_Down) && 
       state == GDK_MOD1_MASK)
     {