diff --git a/ChangeLog b/ChangeLog
index 302312851e..141b891210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-16  Sven Neumann  <sven@gimp.org>
 
+	* app/gui/file-save-dialog.c (file_save_overwrite): set the dialog
+	transient to the file selection dialog (see bug #61092).
+
 	* app/gui/info-dialog.c: set a window type hint of
 	GDK_WINDOW_TYPE_HINT_UTILITY for info windows (fixes bug #92175).
 
diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
index e1cb8e3925..866227c8ed 100644
--- a/app/dialogs/file-save-dialog.c
+++ b/app/dialogs/file-save-dialog.c
@@ -342,6 +342,9 @@ file_save_overwrite (GtkWidget   *save_dialog,
 
   g_free (message);
 
+  gtk_window_set_transient_for (GTK_WINDOW (query_box),
+				GTK_WINDOW (save_dialog));
+
   gtk_widget_show (query_box);
 
   gtk_widget_set_sensitive (save_dialog, FALSE);
diff --git a/app/gui/file-save-dialog.c b/app/gui/file-save-dialog.c
index e1cb8e3925..866227c8ed 100644
--- a/app/gui/file-save-dialog.c
+++ b/app/gui/file-save-dialog.c
@@ -342,6 +342,9 @@ file_save_overwrite (GtkWidget   *save_dialog,
 
   g_free (message);
 
+  gtk_window_set_transient_for (GTK_WINDOW (query_box),
+				GTK_WINDOW (save_dialog));
+
   gtk_widget_show (query_box);
 
   gtk_widget_set_sensitive (save_dialog, FALSE);