1 files changed, 13 insertions, 0 deletions
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 3501c8c27..dd9e5d5f0 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -140,6 +140,19 @@ namespace MediaBrowser.ServerApplication
             }
 
             notifyIcon1.DoubleClick += notifyIcon1_DoubleClick;
+            Application.ApplicationExit += Application_ApplicationExit;
+        }
+
+        void Application_ApplicationExit(object sender, EventArgs e)
+        {
+            try
+            {
+                notifyIcon1.Visible = false;
+            }
+            catch
+            {
+
+            }
         }
 
         void notifyIcon1_DoubleClick(object sender, EventArgs e)