diff --git a/ChangeLog b/ChangeLog
index 59b8289db0..cc33b7cc52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+	the popup posted if the button is released over the cellview.
+	This matches the behaviour of other combo box implementations.  
+	(#171378)
+	
 	* gdk/gdkwindow.c (gdk_window_set_bg_pattern): Adjust offsets
 	when recursing.  (#153682, Felipe Heidrich)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 59b8289db0..cc33b7cc52 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+	the popup posted if the button is released over the cellview.
+	This matches the behaviour of other combo box implementations.  
+	(#171378)
+	
 	* gdk/gdkwindow.c (gdk_window_set_bg_pattern): Adjust offsets
 	when recursing.  (#153682, Felipe Heidrich)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 59b8289db0..cc33b7cc52 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+	the popup posted if the button is released over the cellview.
+	This matches the behaviour of other combo box implementations.  
+	(#171378)
+	
 	* gdk/gdkwindow.c (gdk_window_set_bg_pattern): Adjust offsets
 	when recursing.  (#153682, Felipe Heidrich)
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index e81823d864..f03ebb7ace 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3417,7 +3417,8 @@ gtk_combo_box_list_button_released (GtkWidget      *widget,
 
   if (ewidget != combo_box->priv->tree_view)
     {
-      if (ewidget == combo_box->priv->button &&
+      if ((ewidget == combo_box->priv->button || 
+	   ewidget == combo_box->priv->box) &&
           !popup_in_progress &&
           gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button)))
         {
@@ -3426,7 +3427,8 @@ gtk_combo_box_list_button_released (GtkWidget      *widget,
         }
 
       /* released outside treeview */
-      if (ewidget != combo_box->priv->button)
+      if (ewidget != combo_box->priv->button && 
+	  ewidget != combo_box->priv->box)
         {
           gtk_combo_box_popdown (combo_box);