diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
index eb50427..2cfcc58 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
@@ -142,7 +157,7 @@ namespace Banshee.Gui
             }
             
             Banshee.ServiceStack.Application.Shutdown ();
-            return base.OnDeleteEvent (evnt);
+            return false;
         }
 
         protected override bool OnWindowStateEvent (Gdk.EventWindowState evnt)
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index d93cc14..aa52c74 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -120,6 +120,12 @@ namespace Banshee.NotificationArea
         
         private void Initialize ()
         {
+            interface_action_service.GlobalActions.Add (new ToggleActionEntry[] {
+                new ToggleActionEntry ("ToggleQuitOnCloseAction", null,
+                    Catalog.GetString ("_Quit On Close"), null,
+                    Catalog.GetString ("Do not minimise in tray icon when quit"), ToggleQuitOnClose, QuitOnClose)
+            });
+                
             interface_action_service.GlobalActions.Add (new ActionEntry [] {
                 new ActionEntry ("CloseAction", Stock.Close,
                     Catalog.GetString ("_Close"), "<Control>W",
@@ -350,6 +356,11 @@ namespace Banshee.NotificationArea
         private void ToggleNotifications (object o, EventArgs args)
         {
             ShowNotifications = ((ToggleAction)actions["ToggleNotificationsAction"]).Active;
+        }
+
+        private void ToggleQuitOnClose(object o, EventArgs args)
+        {
+            QuitOnClose = ((ToggleAction)interface_action_service.GlobalActions["ToggleQuitOnCloseAction"]).Active;
         }
         
         private void OnPlayerEvent (PlayerEventArgs args) 
diff --git a/src/Extensions/Banshee.NotificationArea/Resources/NotificationAreaMenu.xml b/src/Extensions/Banshee.NotificationArea/Resources/NotificationAreaMenu.xml
index 899b294..7a7c859 100644
--- a/src/Extensions/Banshee.NotificationArea/Resources/NotificationAreaMenu.xml
+++ b/src/Extensions/Banshee.NotificationArea/Resources/NotificationAreaMenu.xml
@@ -16,6 +16,7 @@
   <menubar name="MainMenu">
     <menu name="MediaMenu" action="MediaMenuAction">
       <placeholder name="ClosePlaceholder">
+      <menuitem name="ToggleQuitOnClose" action="ToggleQuitOnCloseAction"/>
       <menuitem name="Close" action="CloseAction"/>
       </placeholder>
     </menu>
