diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index d93cc14..061ec28 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -131,8 +131,14 @@ namespace Banshee.NotificationArea
                 new ToggleActionEntry ("ToggleNotificationsAction", null,
                     Catalog.GetString ("_Show Notifications"), null,
                     Catalog.GetString ("Show notifications when item changes"), ToggleNotifications, ShowNotifications)
+            });
+
+            actions.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.AddActionGroup (actions);
             ui_manager_id = (int)interface_action_service.UIManager.AddUiFromResource ("NotificationAreaMenu.xml");
             
@@ -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)actions["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..9a50118 100644
--- a/src/Extensions/Banshee.NotificationArea/Resources/NotificationAreaMenu.xml
+++ b/src/Extensions/Banshee.NotificationArea/Resources/NotificationAreaMenu.xml
@@ -8,6 +8,7 @@
     <placeholder name="NotificationPlaceholder" />
     <separator/>
     <menuitem name="ToggleNotifications" action="ToggleNotificationsAction"/>
+	<menuitem name="ToggleQuitOnClose" action="ToggleQuitOnCloseAction"/>
     <separator/>
     <menuitem name="Quit" action="QuitAction"/>
   </popup>
