diff --git a/ChangeLog b/ChangeLog
index cb61833945..b398734ed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_complete): 
+	Resize the popup if necessary.  (#308076, Vincent Noel)
+
 	* gtk/gtkwindow.c (gtk_window_real_set_focus): Queue a
 	draw on the old and new focus widgets, if their defaultness
 	changes.  (#305607, Billy Biggs)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cb61833945..b398734ed6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-06-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_complete): 
+	Resize the popup if necessary.  (#308076, Vincent Noel)
+
 	* gtk/gtkwindow.c (gtk_window_real_set_focus): Queue a
 	draw on the old and new focus widgets, if their defaultness
 	changes.  (#305607, Billy Biggs)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cb61833945..b398734ed6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-06-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_complete): 
+	Resize the popup if necessary.  (#308076, Vincent Noel)
+
 	* gtk/gtkwindow.c (gtk_window_real_set_focus): Queue a
 	draw on the old and new focus widgets, if their defaultness
 	changes.  (#305607, Billy Biggs)
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index f256a15584..411f39157d 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1075,6 +1075,9 @@ gtk_entry_completion_complete (GtkEntryCompletion *completion)
   g_free (tmp);
 
   gtk_tree_model_filter_refilter (completion->priv->filter_model);
+
+  if (GTK_WIDGET_VISIBLE (completion->priv->popup_window))
+    _gtk_entry_completion_resize_popup (completion);
 }
 
 static void