diff --git a/shell/ChangeLog b/shell/ChangeLog
index 431b87ba5e..b4b2300a29 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
+
+	* e-shell-view-menu.c (command_quit): Add a `gtk_main_quit()' at
+	the end here.
+
 2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
 
 	* Makefile.am: Add rules to build the test component and an
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 8936fbed3d..09ea066bcf 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -157,6 +157,8 @@ command_quit (BonoboUIComponent *uih,
 
 	shell = e_shell_view_get_shell (shell_view);
 	e_shell_quit (shell);
+
+	gtk_main_quit ();
 }
 
 #if 0