diff --git a/ui/src/ui/app-settings.ts b/ui/src/ui/app-settings.ts
index 15b97fcee..7e3ab29cf 100644
--- a/ui/src/ui/app-settings.ts
+++ b/ui/src/ui/app-settings.ts
@@ -33,7 +33,7 @@ type SettingsHost = {
   basePath: string;
   themeMedia: MediaQueryList | null;
   themeMediaHandler: ((event: MediaQueryListEvent) => void) | null;
-  pendingGatewayUrl: string | null;
+  pendingGatewayUrl?: string | null;
 };
 
 export function applySettings(host: SettingsHost, next: UiSettings) {
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index bc5ae3510..26f4a5836 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -450,12 +450,14 @@ export class MoltbotApp extends LitElement {
   }
 
   handleGatewayUrlConfirm() {
-    if (!this.pendingGatewayUrl) return;
+    const nextGatewayUrl = this.pendingGatewayUrl;
+    if (!nextGatewayUrl) return;
+    this.pendingGatewayUrl = null;
     applySettingsInternal(
       this as unknown as Parameters<typeof applySettingsInternal>[0],
-      { ...this.settings, gatewayUrl: this.pendingGatewayUrl },
+      { ...this.settings, gatewayUrl: nextGatewayUrl },
     );
-    this.pendingGatewayUrl = null;
+    this.connect();
   }
 
   handleGatewayUrlCancel() {
diff --git a/ui/src/ui/views/gateway-url-confirmation.ts b/ui/src/ui/views/gateway-url-confirmation.ts
index e9fb1a279..7d48c4367 100644
--- a/ui/src/ui/views/gateway-url-confirmation.ts
+++ b/ui/src/ui/views/gateway-url-confirmation.ts
@@ -7,7 +7,7 @@ export function renderGatewayUrlConfirmation(state: AppViewState) {
   if (!pendingGatewayUrl) return nothing;
 
   return html`
-    <div class="exec-approval-overlay" role="dialog" aria-live="polite">
+    <div class="exec-approval-overlay" role="dialog" aria-modal="true" aria-live="polite">
       <div class="exec-approval-card">
         <div class="exec-approval-header">
           <div>