diff --git a/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx b/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
index a7950fc0..b1f48437 100644
--- a/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
+++ b/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
@@ -59,7 +59,6 @@ const GitHubLoginDialog = NiceModal.create(() => {
               setDeviceState(null);
               setError(null);
               await reloadSystem();
-              modal.resolve();
               break;
             case DevicePollStatus.AUTHORIZATION_PENDING:
               timer = setTimeout(poll, deviceState.interval * 1000);
@@ -124,7 +123,15 @@ const GitHubLoginDialog = NiceModal.create(() => {
   };
 
   return (
-    <Dialog open={modal.visible} onOpenChange={modal.resolve}>
+    <Dialog
+      open={modal.visible}
+      onOpenChange={(open) => {
+        if (!open) {
+          modal.resolve(isAuthenticated ? true : false);
+          modal.hide();
+        }
+      }}
+    >
       <DialogContent>
         <DialogHeader>
           <div className="flex items-center gap-3">
@@ -155,7 +162,13 @@ const GitHubLoginDialog = NiceModal.create(() => {
               </CardContent>
             </Card>
             <DialogFooter>
-              <Button onClick={() => modal.resolve()} className="w-full">
+              <Button
+                onClick={() => {
+                  modal.resolve(true);
+                  modal.hide();
+                }}
+                className="w-full"
+              >
                 Close
               </Button>
             </DialogFooter>
@@ -229,7 +242,13 @@ const GitHubLoginDialog = NiceModal.create(() => {
             )}
 
             <DialogFooter>
-              <Button variant="outline" onClick={() => modal.resolve()}>
+              <Button
+                variant="outline"
+                onClick={() => {
+                  modal.resolve(false);
+                  modal.hide();
+                }}
+              >
                 Skip
               </Button>
             </DialogFooter>
@@ -282,7 +301,10 @@ const GitHubLoginDialog = NiceModal.create(() => {
             <DialogFooter className="gap-3 flex-col sm:flex-row">
               <Button
                 variant="outline"
-                onClick={() => modal.resolve()}
+                onClick={() => {
+                  modal.resolve(false);
+                  modal.hide();
+                }}
                 className="flex-1"
               >
                 Skip