diff --git a/ChangeLog b/ChangeLog
index 1c96b4fde8..7b25f299e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup): Add the popup
+	window to the toplevels window group.  (#319912, Christian Persch)
+
 2005-10-28  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): fix
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c96b4fde8..7b25f299e4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup): Add the popup
+	window to the toplevels window group.  (#319912, Christian Persch)
+
 2005-10-28  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): fix
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 92a850185e..b5974698d0 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1417,6 +1417,7 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
 {
   GtkTreeViewColumn *column;
   GList *renderers;
+  GtkWidget *toplevel;
 
   if (GTK_WIDGET_MAPPED (completion->priv->popup_window))
     return;
@@ -1438,6 +1439,11 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
 
   _gtk_entry_completion_resize_popup (completion);
 
+  toplevel = gtk_widget_get_toplevel (completion->priv->entry);
+  if (GTK_IS_WINDOW (toplevel))
+    gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), 
+				 GTK_WINDOW (completion->priv->popup_window));
+  
   gtk_widget_show (completion->priv->popup_window);
     
   gtk_grab_add (completion->priv->popup_window);