diff --git a/AssemblyInfoHelper/GitHub/UpdateUtils.cs b/AssemblyInfoHelper/GitHub/UpdateUtils.cs
index 8aad2e4..528bdc1 100644
--- a/AssemblyInfoHelper/GitHub/UpdateUtils.cs
+++ b/AssemblyInfoHelper/GitHub/UpdateUtils.cs
@@ -115,7 +115,7 @@ public static async Task RunUpdate(GitHubRelease targetRelease)
                 if (useInstaller) { await windowAssemblyInfo.ShowMessageAsync("Update", Properties.Resources.UpdateUtilUpdateFinishedInstallerString, MessageDialogStyle.Affirmative); }
                 else if (useBinaries) { await windowAssemblyInfo.ShowMessageAsync("Update", Properties.Resources.UpdateUtilUpdateFinishedBinariesString, MessageDialogStyle.Affirmative); }
 
-                Environment.Exit(0);                            // Terminate the running application so that the updater/installer can overwrite files
+                System.Windows.Application.Current.Shutdown();      // Closes the running application so that the updater/installer can overwrite files
             }
             catch (Exception ex)
             {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5741908..a02c1e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # AssemblyInfoHelper
 
+## [v5.2.1]
+
+- Fixed hanging application when closed during update (avoid Environment.Exit() call) (#12)
+- Fixed non-working links to repository URL and tags (#11)
+
 ## [v5.2.0]
 
 - Corrected encoding for WebBrowserMarkdown control to show german special characters