diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs
index 9db5260a6..51938a107 100644
--- a/Greenshot/Forms/MainForm.cs
+++ b/Greenshot/Forms/MainForm.cs
@@ -425,14 +425,17 @@ namespace Greenshot {
 		}
 
 		private void BalloonTipClicked(object sender, EventArgs e) {
-			BalloonTipClosed(sender, e);
-			ShowSetting();
+			try {
+				ShowSetting();
+			} finally {
+				BalloonTipClosed(sender, e);
+			}
 		}
+
 		private void BalloonTipClosed(object sender, EventArgs e) {
 			notifyIcon.BalloonTipClicked -= BalloonTipClicked;
 			notifyIcon.BalloonTipClosed -= BalloonTipClosed;
 		}
-		
 
 		private void HandleDataTransport(CopyDataTransport dataTransport) {
 			foreach(KeyValuePair<CommandEnum, string> command in dataTransport.Commands) {
diff --git a/Greenshot/Helpers/UpdateHelper.cs b/Greenshot/Helpers/UpdateHelper.cs
index 49ecf57d3..9fcf16bb3 100644
--- a/Greenshot/Helpers/UpdateHelper.cs
+++ b/Greenshot/Helpers/UpdateHelper.cs
@@ -105,8 +105,7 @@ namespace Greenshot.Experimental {
 			} catch (Exception) {
 				MessageBox.Show(Language.GetFormattedString(LangKey.error_openlink, downloadLink), Language.GetString(LangKey.error));
 			} finally {
-				MainForm.Instance.NotifyIcon.BalloonTipClicked -= HandleBalloonTipClick;
-				MainForm.Instance.NotifyIcon.BalloonTipClosed -= CleanupBalloonTipClick;
+				CleanupBalloonTipClick(sender, e);
 			}
 		}