fix: only auto-close login on explicit post-login redirect, not initial load

windows/LoginWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Microsoft.Web.WebView2.Core;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -28,18 +29,25 @@ public partial class LoginWindow : Window
         {
             if (!e.IsSuccess) return;
             var uri = Browser.CoreWebView2.Source;
-            if (uri.Contains("claude.ai") && !uri.Contains("/login"))
+            if (!uri.Contains("claude.ai")) return;
+
+            var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+            var signedIn = cookies.Any(c =>
+                c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
+                c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
+
+            await Dispatcher.InvokeAsync(() =>
             {
-                // Likely signed in — enable done button
-                var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
-                var hasSess = cookies.Any(c => c.Name.Contains("session") || c.Name.Contains("sk-"));
-                await Dispatcher.InvokeAsync(() =>
-                {
-                    DoneButton.IsEnabled = hasSess || uri.Contains("/chats") || uri.Contains("/new");
-                    StatusText.Text      = DoneButton.IsEnabled
-                        ? "Signed in! Click Done to continue."
-                        : "Waiting for sign-in…";
-                });
+                DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
+                StatusText.Text = signedIn
+                    ? "Signed in — click Done to continue."
+                    : "Complete sign-in, then click Done.";
+            });
+
+            // Auto-close only on explicit post-login redirects, not on initial load
+            if (signedIn && (uri.Contains("/chats") || uri.Contains("/new")))
+            {
+                await SaveAndClose(cookies);
             }
         };
     }
@@ -47,7 +55,12 @@ public partial class LoginWindow : Window
     private async void Done_Click(object sender, RoutedEventArgs e)
     {
         var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+        await SaveAndClose(cookies);
+    }
+
+    private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
+    {
         UsageViewModel.SaveCookies(cookies);
-        DialogResult = true;
+        await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/PopupWindow.xaml.cs

@@ -12,6 +12,7 @@ public partial class PopupWindow : Window
     private static readonly UsageViewModel VM      = App.ViewModel;
     private static readonly UpdateManager  Updater = App.Updater;
     private readonly DispatcherTimer _clockTimer;
+    private bool _dialogOpen;
 
     public PopupWindow()
     {
@@ -29,7 +30,7 @@ public partial class PopupWindow : Window
         UpdateBannerState();
         UpdateFooter();
 
-        Deactivated += (_, _) => Hide();
+        Deactivated += (_, _) => { if (!_dialogOpen) Hide(); };
     }
 
     // ── Card rendering ───────────────────────────────────────────────
@@ -299,12 +300,16 @@ public partial class PopupWindow : Window
 
     private void SignIn_Click(object s, RoutedEventArgs e)
     {
+        _dialogOpen = true;
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
             _ = VM.RefreshAsync();
             InitSettings();
         }
+        _dialogOpen = false;
+        Show();
+        Activate();
     }
 
     private async void SignOut_Click(object s, RoutedEventArgs e)