diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index 65157480..a39fd7d3 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -126,10 +126,10 @@ namespace SourceGit.ViewModels
 
         public void CancelPopup()
         {
-            if (_popup == null)
-                return;
-            if (_popup.InProgress)
+            if (_popup == null || _popup.InProgress)
                 return;
+
+            _popup?.Cleanup();
             Popup = null;
         }