diff --git a/ChangeLog b/ChangeLog
index fca1ca8318..fa769f76fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-21  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-close.c (gimp_display_shell_close):
+	invoke the quit action instead of calling gimp_exit() so its
+	sensitivity is taken into account.
+
 2008-03-21  Michael Natterer  <mitch@gimp.org>
 
 	Remove the toolbox menu:
diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
index c5e108bf84..dcc4874c43 100644
--- a/app/display/gimpdisplayshell-close.c
+++ b/app/display/gimpdisplayshell-close.c
@@ -100,7 +100,11 @@ gimp_display_shell_close (GimpDisplayShell *shell,
     }
   else
     {
-      gimp_exit (shell->display->gimp, FALSE);
+      /* Activate the action instead of simply calling gimp_exit(), so
+       * the quit action's sensitivity is taken into account.
+       */
+      gimp_ui_manager_activate_action (shell->menubar_manager,
+                                       "file", "file-quit");
     }
 }