diff --git a/App.xaml.cs b/App.xaml.cs
index b5144a7..34192a9 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -93,6 +93,8 @@ namespace WorkIndicator
                 return;
 
             _dispatcher.Invoke(() => TrayIcon.ShowUpdateMessage(message));
+
+            TrayIcon.Dispose();
         }
 
         protected override void OnExit(ExitEventArgs e)
diff --git a/TrayIcon.cs b/TrayIcon.cs
index 8d5d9b3..e055bce 100644
--- a/TrayIcon.cs
+++ b/TrayIcon.cs
@@ -70,7 +70,7 @@ namespace WorkIndicator
 
         public static void ShowUpdateMessage(string text)
         {
-            _trayIcon.ShowBalloonTip(250, Resources.ApplicationName, text, ToolTipIcon.None);
+            _trayIcon.ShowBalloonTip(200, Resources.ApplicationName, text, ToolTipIcon.None);
         }
 
         static void HandleContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)