diff --git a/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx b/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
index 8c0c9325..13874e81 100644
--- a/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
+++ b/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
@@ -57,9 +57,11 @@ const GitHubLoginDialog = NiceModal.create(() => {
           switch (poll_status) {
             case DevicePollStatus.SUCCESS:
               setPolling(false);
-              setDeviceState(null);
               setError(null);
               await reloadSystem();
+              modal.resolve(true);
+              modal.hide();
+              setDeviceState(null);
               break;
             case DevicePollStatus.AUTHORIZATION_PENDING:
               timer = setTimeout(poll, deviceState.interval * 1000);
diff --git a/frontend/src/pages/settings/GeneralSettings.tsx b/frontend/src/pages/settings/GeneralSettings.tsx
index 15f95c0c..a6e02148 100644
--- a/frontend/src/pages/settings/GeneralSettings.tsx
+++ b/frontend/src/pages/settings/GeneralSettings.tsx
@@ -486,13 +486,7 @@ export function GeneralSettings() {
               <p className="text-sm text-muted-foreground">
                 {t('settings.general.github.helper')}
               </p>
-              <Button
-                onClick={() =>
-                  NiceModal.show('github-login').finally(() =>
-                    NiceModal.hide('github-login')
-                  )
-                }
-              >
+              <Button onClick={() => NiceModal.show('github-login')}>
                 {t('settings.general.github.connectButton')}
               </Button>
             </div>