diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 1f1d7f1a00..0b4da80ec9 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -528,6 +528,9 @@ quit_close_all_dialog_save_clicked (GtkCellRenderer *cell,
                   manager = gimp_image_window_get_ui_manager (window);
 
                   gimp_display_shell_present (shell);
+                  /* Make sure the quit dialog kept keyboard focus when
+                   * the save dialog will exit. */
+                  gtk_window_present (GTK_WINDOW (private->dialog));
 
                   if (state & GDK_SHIFT_MASK)
                     {