diff --git a/ChangeLog b/ChangeLog
index 0ee41562b8..cc1f224c8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkprintoperation-win32.c (pageDlgProc): Set the
+	GtkWin32EmbedWidget we create here as modal. Fixes #389358.
+
 2007-09-21  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtkstyle.c (option_menu_get_props)
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 1c034bfbfc..eb061afb53 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -1310,6 +1310,7 @@ pageDlgProc (HWND wnd, UINT message, WPARAM wparam, LPARAM lparam)
       SetWindowLongPtrW(wnd, GWLP_USERDATA, (LONG_PTR)op);
       
       plug = _gtk_win32_embed_widget_new ((GdkNativeWindow) wnd);
+      gtk_window_set_modal (GTK_WINDOW (plug), TRUE);
       op_win32->embed_widget = plug;
       gtk_container_add (GTK_CONTAINER (plug), op->priv->custom_widget);
       gtk_widget_show (op->priv->custom_widget);