diff --git a/apps/control/src/app/control-state.service.ts b/apps/control/src/app/control-state.service.ts
index e50eae85e53..3e295a471bc 100644
--- a/apps/control/src/app/control-state.service.ts
+++ b/apps/control/src/app/control-state.service.ts
@@ -541,11 +541,14 @@ export class ControlStateService extends AsyncHandler {
 
     /** Open select meeting modal */
     public async selectMeeting(input?: string) {
-        const cals = this.calendars();
-        if (cals?.length) this.setCalendar(cals[0]);
         this._dialog.open(SelectMeetingModalComponent, {
             data: { input },
         });
+        // Untracked so an effect that calls this does not re-run when the
+        // calendars load, which would open the list again
+        await untracked(() => this._cal.loadCalendars());
+        const first = untracked(this.calendars)[0];
+        if (!untracked(this._calendar) && first) this.setCalendar(first);
     }
 
     /** Open view help modal */
diff --git a/apps/control/src/app/error-text.ts b/apps/control/src/app/error-text.ts
new file mode 100644
index 00000000000..f052e272849
--- /dev/null
+++ b/apps/control/src/app/error-text.ts
@@ -0,0 +1,18 @@
+import { errorMessage } from '@placeos/common';
+
+/**
+ * Readable text for a failed request, for error notifications.
+ * Driver and API errors are plain objects (realtime errors carry `msg`),
+ * so they print as `[object Object]` when passed to a message directly.
+ */
+export function errorText(error: unknown): string {
+    const message = errorMessage(error);
+    if (message) return message;
+    const { msg, code, status } = (error ?? {}) as {
+        msg?: unknown;
+        code?: number;
+        status?: number;
+    };
+    if (typeof msg === 'string' && msg) return msg;
+    return `${code ?? status ?? 'unknown'}`;
+}
diff --git a/apps/control/src/app/tabbed-view/tab-outlet.component.ts b/apps/control/src/app/tabbed-view/tab-outlet.component.ts
index 7e181b81277..19481831426 100644
--- a/apps/control/src/app/tabbed-view/tab-outlet.component.ts
+++ b/apps/control/src/app/tabbed-view/tab-outlet.component.ts
@@ -131,6 +131,7 @@ import { TVControlsComponent } from './tv-controls.component';
                             @if (call()) {
                                 <div
                                     video-call-page
+                                    [reserve_top]="!!tab()?.help"
                                     [present_output]="
                                         tab()?.presentation_source
                                     "
diff --git a/apps/control/src/app/ui/select-meeting-modal.component.ts b/apps/control/src/app/ui/select-meeting-modal.component.ts
index 2fc76dbcf21..dd22723f4de 100644
--- a/apps/control/src/app/ui/select-meeting-modal.component.ts
+++ b/apps/control/src/app/ui/select-meeting-modal.component.ts
@@ -19,6 +19,7 @@ import {
 } from '@placeos/components';
 import { format } from 'date-fns';
 import { ControlStateService } from '../control-state.service';
+import { errorText } from '../error-text';
 
 @Component({
     selector: 'select-meeting-modal',
@@ -143,7 +144,11 @@ export class SelectMeetingModalComponent {
         try {
             await this._service.setEvent(e);
         } catch (error) {
-            notifyError(i18n('APP.CONTROL.MEETING_JOIN_ERROR', { error }));
+            notifyError(
+                i18n('APP.CONTROL.MEETING_JOIN_ERROR', {
+                    error: errorText(error),
+                }),
+            );
             return;
         } finally {
             details.close();
diff --git a/apps/control/src/app/ui/source-select.component.ts b/apps/control/src/app/ui/source-select.component.ts
index 20cef62e35e..121450ac346 100644
--- a/apps/control/src/app/ui/source-select.component.ts
+++ b/apps/control/src/app/ui/source-select.component.ts
@@ -11,6 +11,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { i18n, notifyError, unique } from '@placeos/common';
 import { TranslatePipe } from '@placeos/components';
 import { ControlStateService, RoomInput } from '../control-state.service';
+import { errorText } from '../error-text';
 
 @Component({
     selector: 'source-select',
@@ -124,7 +125,9 @@ export class SourceSelectComponent {
         try {
             await this._state.setRoute(input.id, this.output());
         } catch (error) {
-            notifyError(i18n('APP.CONTROL.ROUTE_ERROR', { error }));
+            notifyError(
+                i18n('APP.CONTROL.ROUTE_ERROR', { error: errorText(error) }),
+            );
             return;
         } finally {
             this.loading.set(false);
diff --git a/apps/control/src/app/ui/voice-assistant.service.ts b/apps/control/src/app/ui/voice-assistant.service.ts
index 4e09f6b9aef..1173e65c55a 100644
--- a/apps/control/src/app/ui/voice-assistant.service.ts
+++ b/apps/control/src/app/ui/voice-assistant.service.ts
@@ -292,6 +292,8 @@ export class VoiceAssistantService extends AsyncHandler {
         speech.onend = null;
         speech.abort();
         this._user_speech = undefined;
+        // Commands need voice control, so drop the chat connection with it
+        this._chat_service.endChat();
     }
 
     private _sendCommand(command: string, attempt = 0) {
diff --git a/apps/control/src/app/video-call/video-call-dial-view.component.ts b/apps/control/src/app/video-call/video-call-dial-view.component.ts
index 54e83ec2bba..602413357e0 100644
--- a/apps/control/src/app/video-call/video-call-dial-view.component.ts
+++ b/apps/control/src/app/video-call/video-call-dial-view.component.ts
@@ -6,6 +6,7 @@ import { MatInputModule } from '@angular/material/input';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { i18n, notifyError } from '@placeos/common';
 import { IconComponent, TranslatePipe } from '@placeos/components';
+import { errorText } from '../error-text';
 import { DialpadComponent } from '../ui/dialpad.component';
 import { VideoCallStateService } from './video-call-state.service';
 
@@ -116,7 +117,9 @@ export class VideoCallDialViewComponent {
         try {
             await this._call.dial(dial_number);
         } catch (error) {
-            notifyError(i18n('APP.CONTROL.VC_DIAL_ERROR', { error }));
+            notifyError(
+                i18n('APP.CONTROL.VC_DIAL_ERROR', { error: errorText(error) }),
+            );
             return;
         } finally {
             this.loading.set(false);
diff --git a/apps/control/src/app/video-call/video-call-page.component.ts b/apps/control/src/app/video-call/video-call-page.component.ts
index bc668c5224d..8036e840a57 100644
--- a/apps/control/src/app/video-call/video-call-page.component.ts
+++ b/apps/control/src/app/video-call/video-call-page.component.ts
@@ -6,6 +6,7 @@ import {
     effect,
     inject,
     input,
+    linkedSignal,
     signal,
     untracked,
 } from '@angular/core';
@@ -23,6 +24,7 @@ import {
 } from '@placeos/common';
 import { IconComponent, TranslatePipe } from '@placeos/components';
 import { ControlStateService } from '../control-state.service';
+import { errorText } from '../error-text';
 import { selectCamera } from '../ui/camera-commands';
 import { DialpadComponent } from '../ui/dialpad.component';
 import {
@@ -133,7 +135,9 @@ import {
                         ></dialpad>
                     </div>
                     <div
+                        actions
                         class="flex flex-1 flex-col items-center justify-center space-y-4 p-2"
+                        [class.pt-14]="reserve_top()"
                     >
                         <button
                             btn
@@ -245,19 +249,30 @@ export class VideoCallPageComponent extends AsyncHandler implements OnInit {
     private _router = inject(Router);
     private _injector = inject(Injector);
 
+    /** Latest layout and presentation mode change requests */
+    private _layout_request = 0;
+    private _mode_request = 0;
     /** Whether the page has already left for the ended call */
     private _left = false;
 
     public readonly redirect = input(true);
     public readonly present_output = input('');
+    /** Leave space above the call actions for a button placed over the page */
+    public readonly reserve_top = input(false);
     public readonly loading = signal('');
     public readonly call = this._state.call;
     private readonly _show_camera_pip = this._state.show_camera_pip;
     public readonly show_camera_pip = computed(() => !!this._show_camera_pip());
     private readonly _mic_mute = this._state.mic_mute;
     public readonly mic_mute = computed(() => !!this._mic_mute());
-    public readonly video_layout = this._state.video_layout;
-    public readonly presentation_mode = this._state.presentation_mode;
+    /** Selected layout. Set on change, and reset to the codec value when the change fails. */
+    public readonly video_layout = linkedSignal(() =>
+        this._state.video_layout(),
+    );
+    /** Selected presentation mode. Reset to the codec value when a change fails. */
+    public readonly presentation_mode = linkedSignal(() =>
+        this._state.presentation_mode(),
+    );
     public readonly presentables = this._control.presentables;
     /** List of available cameras to select from */
     public readonly camera_list = this._control.camera_list;
@@ -274,10 +289,21 @@ export class VideoCallPageComponent extends AsyncHandler implements OnInit {
     public readonly sentDTMF = (d) => this._state.sendDTMF(d);
     public readonly setPresentationSource = (i) =>
         this._control.setRoute(i.id, this.present_output(), false);
-    public readonly setPresentationMode = (d: PresentationMode) =>
-        this._state.setPresentationMode(d);
-    public readonly setVideoLayout = (d: VideoLayout) =>
-        this._state.setVideoLayout(d);
+    /** Reset on failure only if no newer change started, so a later choice is kept */
+    public readonly setPresentationMode = async (d: PresentationMode) => {
+        const request = ++this._mode_request;
+        this.presentation_mode.set(d);
+        if (await this._state.setPresentationMode(d)) return;
+        if (request !== this._mode_request) return;
+        this.presentation_mode.set(this._state.presentation_mode());
+    };
+    public readonly setVideoLayout = async (d: VideoLayout) => {
+        const request = ++this._layout_request;
+        this.video_layout.set(d);
+        if (await this._state.setVideoLayout(d)) return;
+        if (request !== this._layout_request) return;
+        this.video_layout.set(this._state.video_layout());
+    };
     public readonly toggleCamera = async () =>
         this._state.showCameraPIP(!this.show_camera_pip());
     public readonly toggleMute = async () =>
@@ -285,11 +311,15 @@ export class VideoCallPageComponent extends AsyncHandler implements OnInit {
     public readonly toggleOnHold = () => this._state.toggleCallOnHold();
     public readonly endCall = async () => {
         this.loading.set(i18n('APP.CONTROL.VC_LEAVE_LOADING'));
-        await this._state.hangup().catch((_) => {
+        try {
+            await this._state.hangup();
+        } catch (error) {
             this.loading.set('');
-            notifyError(i18n('APP.CONTROL.VC_LEAVE_ERROR', { error: _ }));
-            throw _;
-        });
+            notifyError(
+                i18n('APP.CONTROL.VC_LEAVE_ERROR', { error: errorText(error) }),
+            );
+            return;
+        }
         this._onCallEnded();
     };
 
diff --git a/apps/control/src/app/video-call/video-call-state.service.ts b/apps/control/src/app/video-call/video-call-state.service.ts
index d2e16868302..270892e775c 100644
--- a/apps/control/src/app/video-call/video-call-state.service.ts
+++ b/apps/control/src/app/video-call/video-call-state.service.ts
@@ -2,6 +2,7 @@ import { computed, inject, Injectable, Signal } from '@angular/core';
 import { i18n, notifyError } from '@placeos/common';
 import { getModule } from '@placeos/ts-client';
 import { ControlStateService } from '../control-state.service';
+import { errorText } from '../error-text';
 import { systemBinding } from '../system-binding';
 
 export type VideoLayout = 'Auto' | 'Equal' | 'Overlay' | 'Prominent' | 'Single';
@@ -108,22 +109,28 @@ export class VideoCallStateService {
         return this._exec('dtmf_send', [digit]);
     }
 
-    public toggleCallOnHold() {
+    public async toggleCallOnHold() {
         const call = this.call();
-        if (!call) return;
+        if (!call) return false;
         return this._exec(
             call.Status === 'OnHold' ? 'call_resume' : 'call_place_on_hold',
         );
     }
 
-    /** Run a VidConf method. Shows an error and resolves when it fails. */
+    /** Run a VidConf method. Shows an error when it fails. Resolves `true` on success. */
     private async _exec(method: string, args: unknown[] = []) {
         const id = this._control.id;
-        if (!id) return;
+        if (!id) return false;
         try {
-            return await getModule(id, 'VidConf').execute(method, args);
+            await getModule(id, 'VidConf').execute(method, args);
+            return true;
         } catch (error) {
-            notifyError(i18n('APP.CONTROL.VC_COMMAND_ERROR', { error }));
+            notifyError(
+                i18n('APP.CONTROL.VC_COMMAND_ERROR', {
+                    error: errorText(error),
+                }),
+            );
+            return false;
         }
     }
 
diff --git a/apps/control/src/tests/control-state.service.spec.ts b/apps/control/src/tests/control-state.service.spec.ts
index 3ec90a03865..a8681663dd0 100644
--- a/apps/control/src/tests/control-state.service.spec.ts
+++ b/apps/control/src/tests/control-state.service.spec.ts
@@ -1,11 +1,12 @@
+import { effect, signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import {
     createServiceFactory,
     SpectatorService,
 } from '@ngneat/spectator/vitest';
+import { Calendar } from '@placeos/common';
 import { CalendarService, SpacesService } from '@placeos/events';
-import { of } from 'rxjs';
 
 vi.mock('@placeos/ts-client', { spy: true });
 
@@ -23,11 +24,21 @@ describe('ControlStateService', () => {
     /** Names of bindings that were released */
     let released: string[];
     const loadSpace = vi.fn();
+    const calendar_list = signal<Calendar[]>([]);
+    // Reads the list before awaiting, like CalendarService.loadCalendars
+    const loadCalendars = vi.fn(async () => {
+        if (calendar_list().length) return;
+        await Promise.resolve();
+        calendar_list.set([{ id: 'cal-1' } as Calendar]);
+    });
     const createService = createServiceFactory({
         service: ControlStateService,
         providers: [
             { provide: MatDialog, useValue: { open: vi.fn() } },
-            { provide: CalendarService, useValue: { calendars: of([]) } },
+            {
+                provide: CalendarService,
+                useValue: { calendar_list, loadCalendars },
+            },
             {
                 provide: SpacesService,
                 useValue: { loadSpaces: vi.fn(), loadSpace },
@@ -104,4 +115,27 @@ describe('ControlStateService', () => {
         expect(navigate).not.toHaveBeenCalled();
         expect(localStorage.getItem(CONTROL_STORE_KEY)).toBe('sys-1');
     });
+
+    it('should load calendars and pick the first when selecting a meeting', async () => {
+        calendar_list.set([]);
+        await spectator.service.selectMeeting();
+        expect(loadCalendars).toHaveBeenCalled();
+        expect(spectator.service.calendar()?.id).toBe('cal-1');
+    });
+
+    it('should not open the meeting list again when calendars load', async () => {
+        const dialog = spectator.inject(MatDialog);
+        vi.mocked(dialog.open).mockClear();
+        calendar_list.set([]);
+        const ref = TestBed.runInInjectionContext(() =>
+            effect(() => {
+                spectator.service.selectMeeting();
+            }),
+        );
+        TestBed.tick();
+        await new Promise((r) => setTimeout(r));
+        TestBed.tick();
+        expect(dialog.open).toHaveBeenCalledTimes(1);
+        ref.destroy();
+    });
 });
diff --git a/apps/control/src/tests/error-text.spec.ts b/apps/control/src/tests/error-text.spec.ts
new file mode 100644
index 00000000000..aa68a2e8709
--- /dev/null
+++ b/apps/control/src/tests/error-text.spec.ts
@@ -0,0 +1,16 @@
+import { errorText } from '../app/error-text';
+
+describe('errorText', () => {
+    it('should use the error message when there is one', () => {
+        expect(errorText(new Error('busy'))).toBe('busy');
+        expect(errorText({ message: 'not found' })).toBe('not found');
+        expect(errorText('offline')).toBe('offline');
+    });
+
+    it('should fall back to the error code or status', () => {
+        expect(errorText({ code: 3, msg: 'Codec busy' })).toBe('Codec busy');
+        expect(errorText({ code: 500 })).toBe('500');
+        expect(errorText({ status: 404 })).toBe('404');
+        expect(errorText(undefined)).toBe('unknown');
+    });
+});
diff --git a/apps/control/src/tests/tabbed-view/tab-outlet.component.spec.ts b/apps/control/src/tests/tabbed-view/tab-outlet.component.spec.ts
index 07d115d9fc8..47456a1da75 100644
--- a/apps/control/src/tests/tabbed-view/tab-outlet.component.spec.ts
+++ b/apps/control/src/tests/tabbed-view/tab-outlet.component.spec.ts
@@ -4,7 +4,7 @@ import {
     SpectatorRouting,
 } from '@ngneat/spectator/vitest';
 import { mockComponent, mockDirective } from '@placeos/common/tests';
-import { MockPipe, MockProvider } from 'ng-mocks';
+import { MockPipe, MockProvider, ngMocks } from 'ng-mocks';
 
 import {
     BindingDirective,
@@ -264,4 +264,16 @@ describe('TabOutletComponent', () => {
         );
         vi.useRealTimers();
     });
+
+    it('should leave room for the help button above the call controls', () => {
+        const service: any = spectator.inject(ControlStateService);
+        const call_state: any = spectator.inject(VideoCallStateService);
+        service.tabs.set([
+            { id: 'tab1', controls: 'vidconf-controls', help: 'vc-help' },
+        ]);
+        call_state.call.set({ Status: 'Connected' });
+        spectator.detectChanges();
+        expect(ngMocks.input('[video-call-page]', 'reserve_top')).toBe(true);
+        call_state.call.set(null);
+    });
 });
diff --git a/apps/control/src/tests/ui/voice-assistant.service.spec.ts b/apps/control/src/tests/ui/voice-assistant.service.spec.ts
index eb9531f84d9..0368a8590be 100644
--- a/apps/control/src/tests/ui/voice-assistant.service.spec.ts
+++ b/apps/control/src/tests/ui/voice-assistant.service.spec.ts
@@ -53,6 +53,7 @@ describe('VoiceAssistantService', () => {
             startChat: vi.fn(),
             sendMessage: vi.fn(),
             close: vi.fn(),
+            endChat: vi.fn(),
         };
         spectator = createService({
             providers: [{ provide: ChatService, useValue: chat }],
@@ -106,6 +107,7 @@ describe('VoiceAssistantService', () => {
         expect(spectator.service.enabled()).toBe(false);
         expect(instance.abort).toHaveBeenCalled();
         expect(instance.onresult).toBeNull();
+        expect(chat.endChat).toHaveBeenCalled();
     });
 
     it('should report speech recognition as unavailable when the browser lacks it', () => {
diff --git a/apps/control/src/tests/video-call/video-call-page.component.spec.ts b/apps/control/src/tests/video-call/video-call-page.component.spec.ts
index 91dc82d800b..7769de6fcd8 100644
--- a/apps/control/src/tests/video-call/video-call-page.component.spec.ts
+++ b/apps/control/src/tests/video-call/video-call-page.component.spec.ts
@@ -168,7 +168,7 @@ describe('VideoCallPageComponent', () => {
 
     it('should surface errors and stop loading when hangup fails', async () => {
         call_state.hangup.mockRejectedValue('boom');
-        await expect(spectator.component.endCall()).rejects.toBe('boom');
+        await expect(spectator.component.endCall()).resolves.toBeUndefined();
         expect(spectator.component.loading()).toBe('');
         expect(router_mock.navigate).not.toHaveBeenCalled();
     });
@@ -178,4 +178,36 @@ describe('VideoCallPageComponent', () => {
         expect(client.getModule).toHaveBeenCalledWith('sys-1', 'System');
         expect(execute_spy).toHaveBeenCalledWith('selected_camera', ['cam-1']);
     });
+
+    it('should reset the layout select when the change fails', async () => {
+        call_state.setVideoLayout.mockResolvedValue(false);
+        await spectator.component.setVideoLayout('Single');
+        expect(spectator.component.video_layout()).toBe('Auto');
+    });
+
+    it('should keep the new layout when the change succeeds', async () => {
+        call_state.setVideoLayout.mockResolvedValue(true);
+        await spectator.component.setVideoLayout('Single');
+        expect(spectator.component.video_layout()).toBe('Single');
+    });
+
+    it('should leave space above the call actions when asked', () => {
+        expect(spectator.query('[actions]')).not.toHaveClass('pt-14');
+        spectator.setInput({ reserve_top: true });
+        expect(spectator.query('[actions]')).toHaveClass('pt-14');
+    });
+
+    it('should keep a later layout when an earlier change fails last', async () => {
+        let fail_first: (ok: boolean) => void = () => null;
+        call_state.setVideoLayout
+            .mockImplementationOnce(
+                () => new Promise<boolean>((r) => (fail_first = r)),
+            )
+            .mockResolvedValueOnce(true);
+        const first = spectator.component.setVideoLayout('Single');
+        await spectator.component.setVideoLayout('Equal');
+        fail_first(false);
+        await first;
+        expect(spectator.component.video_layout()).toBe('Equal');
+    });
 });
diff --git a/apps/control/src/tests/video-call/video-call-state.service.spec.ts b/apps/control/src/tests/video-call/video-call-state.service.spec.ts
index a4b72a4c9cd..afc1b87a931 100644
--- a/apps/control/src/tests/video-call/video-call-state.service.spec.ts
+++ b/apps/control/src/tests/video-call/video-call-state.service.spec.ts
@@ -143,8 +143,8 @@ describe('VideoCallStateService', () => {
 
     it('should resolve instead of throwing when a command fails', async () => {
         execute_spy.mockRejectedValue(new Error('offline'));
-        await expect(
-            spectator.service.muteMicrophone(true),
-        ).resolves.toBeUndefined();
+        await expect(spectator.service.muteMicrophone(true)).resolves.toBe(
+            false,
+        );
     });
 });
diff --git a/libs/components/src/lib/chat/chat.service.ts b/libs/components/src/lib/chat/chat.service.ts
index 5e8c7bdb7df..d289375b133 100644
--- a/libs/components/src/lib/chat/chat.service.ts
+++ b/libs/components/src/lib/chat/chat.service.ts
@@ -78,19 +78,21 @@ export class ChatService extends AsyncHandler {
             this._chat_id ? '&resume=' + encodeURIComponent(this._chat_id) : ''
         }`;
         log('CHAT', 'Starting chat connection.');
-        this._socket = new WebSocket(url);
-        this._socket.onmessage = (event) => {
+        const socket = new WebSocket(url);
+        this._socket = socket;
+        socket.onmessage = (event) => {
             let msg = event.data;
             try {
                 msg = JSON.parse(event.data);
             } catch (e) {}
             this._onMessage(msg);
         };
-        this._socket.onerror = (e) => {
+        socket.onerror = (e) => {
             log('CHAT', 'Connection error:', [e], 'error');
-            this._cleanup();
+            this._cleanup(socket);
         };
-        this._socket.onclose = () => this._cleanup();
+        // Only clear this socket. A newer chat may already be open.
+        socket.onclose = () => this._cleanup(socket);
         return () => this.endChat();
     }
 
@@ -136,7 +138,9 @@ export class ChatService extends AsyncHandler {
         );
     }
 
-    private _cleanup() {
+    /** Forget the socket. With a socket given, only if it is still the current one. */
+    private _cleanup(socket?: WebSocket) {
+        if (socket && socket !== this._socket) return;
         this._socket = null;
     }
 
diff --git a/libs/components/src/lib/custom-tooltip.component.ts b/libs/components/src/lib/custom-tooltip.component.ts
index 6ac41ff7814..6cd78015bc5 100644
--- a/libs/components/src/lib/custom-tooltip.component.ts
+++ b/libs/components/src/lib/custom-tooltip.component.ts
@@ -20,6 +20,7 @@ import {
     viewChild,
 } from '@angular/core';
 import { AsyncHandler } from '@placeos/common';
+import { filter } from 'rxjs/operators';
 import { SanitizePipe } from './sanitise.pipe';
 
 @Injectable()
@@ -229,6 +230,13 @@ export class CustomTooltipComponent<T = any>
                         ]),
                 });
                 this._overlay_ref.attach(portal);
+                this.subscription(
+                    'escape',
+                    this._overlay_ref
+                        .keydownEvents()
+                        .pipe(filter((e) => e.key === 'Escape'))
+                        .subscribe(() => this.close()),
+                );
                 if (this.backdrop()) {
                     this.subscription(
                         'backdrop',
diff --git a/libs/components/src/tests/chat.service.spec.ts b/libs/components/src/tests/chat.service.spec.ts
new file mode 100644
index 00000000000..c11029bc3ba
--- /dev/null
+++ b/libs/components/src/tests/chat.service.spec.ts
@@ -0,0 +1,80 @@
+import { signal } from '@angular/core';
+import {
+    createServiceFactory,
+    SpectatorService,
+} from '@ngneat/spectator/vitest';
+import { OrganisationService, SettingsService } from '@placeos/common';
+
+vi.mock('@placeos/ts-client', { spy: true });
+
+import * as client from '@placeos/ts-client';
+import { ChatService } from '../lib/chat/chat.service';
+
+/** WebSocket stand-in that records instances */
+class FakeSocket {
+    public static instances: FakeSocket[] = [];
+    public readyState = 1;
+    public onmessage: ((e: MessageEvent) => void) | null = null;
+    public onerror: ((e: Event) => void) | null = null;
+    public onclose: (() => void) | null = null;
+    public close = vi.fn();
+    public send = vi.fn();
+    public addEventListener = vi.fn();
+    constructor(public url: string) {
+        FakeSocket.instances.push(this);
+    }
+}
+
+describe('ChatService', () => {
+    let spectator: SpectatorService<ChatService>;
+    const original_socket = window.WebSocket;
+    const createService = createServiceFactory({
+        service: ChatService,
+        providers: [
+            {
+                provide: OrganisationService,
+                useValue: {
+                    active_building: signal({ id: 'bld-1' }),
+                    binding: () => '',
+                },
+            },
+            { provide: SettingsService, useValue: { get: vi.fn() } },
+        ],
+    });
+
+    beforeEach(() => {
+        FakeSocket.instances = [];
+        (window as unknown as { WebSocket: unknown }).WebSocket = FakeSocket;
+        vi.mocked(client.getModule).mockImplementation(
+            () =>
+                ({
+                    variable: () => ({
+                        bind: () => () => null,
+                        listen: () => ({ subscribe: () => () => null }),
+                    }),
+                }) as unknown as ReturnType<typeof client.getModule>,
+        );
+        spectator = createService();
+        spectator.service.setBinding('sys-1');
+    });
+
+    afterEach(() => {
+        window.WebSocket = original_socket;
+    });
+
+    it('should keep a new chat when the previous socket closes late', () => {
+        spectator.service.startChat();
+        const first = FakeSocket.instances[0];
+        spectator.service.endChat();
+        spectator.service.startChat();
+        expect(FakeSocket.instances).toHaveLength(2);
+        first.onclose?.();
+        expect(spectator.service.connected).toBe(true);
+    });
+
+    it('should forget the current socket when it closes', () => {
+        spectator.service.startChat();
+        FakeSocket.instances[0].onclose?.();
+        expect(spectator.service.connected).toBe(false);
+    });
+});
diff --git a/libs/components/src/tests/custom-tooltip.component.spec.ts b/libs/components/src/tests/custom-tooltip.component.spec.ts
index d73e9ee846d..040610c9279 100644
--- a/libs/components/src/tests/custom-tooltip.component.spec.ts
+++ b/libs/components/src/tests/custom-tooltip.component.spec.ts
@@ -126,6 +126,28 @@ describe('CustomTooltipComponent', () => {
         );
     });
 
+    it('should close when Escape is pressed', async () => {
+        spectator = createDirective(`
+            <div customTooltip [content]="content"></div>
+            <ng-template #content>Escape Template</ng-template>
+        `);
+        overlay_container = spectator.inject(OverlayContainer);
+        spectator.click(spectator.query('div'));
+        await settle();
+        expect(overlay_container.getContainerElement().textContent).toContain(
+            'Escape Template',
+        );
+
+        document.body.dispatchEvent(
+            new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }),
+        );
+        await settle();
+
+        expect(
+            overlay_container.getContainerElement().textContent,
+        ).not.toContain('Escape Template');
+    });
+
     it('should allow rendering HTML', async () => {
         spectator = createDirective(
             '<div customTooltip [content]="content"></div>',
diff --git a/shared/assets/locale/en-AU.json b/shared/assets/locale/en-AU.json
index 44b47243a78..9a023b5fd9d 100644
--- a/shared/assets/locale/en-AU.json
+++ b/shared/assets/locale/en-AU.json
@@ -2980,7 +2980,7 @@
             "VC_PIP_SHOW": "Show Camera PIP",
             "VC_PIP_HIDE": "Hide Camera PIP",
             "VC_JOIN_ERROR": "Unable to find active video conference",
-            "VC_LEAVE_ERROR": "Failed to hung up call. Error: {{ error }}",
+            "VC_LEAVE_ERROR": "Could not hang up the call. Error: {{ error }}",
             "VC_DIAL_ERROR": "Could not dial the call. Error: {{ error }}",
             "VC_COMMAND_ERROR": "Video conference command failed. Error: {{ error }}",
             "VC_LEAVE_LOADING": "Hanging up call...",
diff --git a/shared/assets/locale/en-GB.json b/shared/assets/locale/en-GB.json
index 99a1c24fa2e..aeb1ae8c025 100644
--- a/shared/assets/locale/en-GB.json
+++ b/shared/assets/locale/en-GB.json
@@ -1973,7 +1973,7 @@
             "VC_PIP_SHOW": "Show Camera PIP",
             "VC_PIP_HIDE": "Hide Camera PIP",
             "VC_JOIN_ERROR": "Unable to find active video conference",
-            "VC_LEAVE_ERROR": "Failed to hung up call. Error: {{ error }}",
+            "VC_LEAVE_ERROR": "Could not hang up the call. Error: {{ error }}",
             "VC_DIAL_ERROR": "Could not dial the call. Error: {{ error }}",
             "VC_COMMAND_ERROR": "Video conference command failed. Error: {{ error }}",
             "VC_LEAVE_LOADING": "Hanging up call...",
diff --git a/shared/assets/locale/en-US.json b/shared/assets/locale/en-US.json
index f93afb32278..73213b9d90c 100644
--- a/shared/assets/locale/en-US.json
+++ b/shared/assets/locale/en-US.json
@@ -1973,7 +1973,7 @@
             "VC_PIP_SHOW": "Show Camera PIP",
             "VC_PIP_HIDE": "Hide Camera PIP",
             "VC_JOIN_ERROR": "Unable to find active video conference",
-            "VC_LEAVE_ERROR": "Failed to hung up call. Error: {{ error }}",
+            "VC_LEAVE_ERROR": "Could not hang up the call. Error: {{ error }}",
             "VC_DIAL_ERROR": "Could not dial the call. Error: {{ error }}",
             "VC_COMMAND_ERROR": "Video conference command failed. Error: {{ error }}",
             "VC_LEAVE_LOADING": "Hanging up call...",
diff --git a/shared/assets/locale/fr.json b/shared/assets/locale/fr.json
index baa61da2bbb..20ba0c1054f 100644
--- a/shared/assets/locale/fr.json
+++ b/shared/assets/locale/fr.json
@@ -1888,7 +1888,7 @@
             "VC_PIP_SHOW": "Afficher la caméra en incrustation",
             "VC_PIP_HIDE": "Masquer la caméra en incrustation",
             "VC_JOIN_ERROR": "Impossible de trouver une visioconférence active",
-            "VC_LEAVE_ERROR": "Failed to hung up call. Error: {{ error }}",
+            "VC_LEAVE_ERROR": "Impossible de raccrocher l'appel. Erreur : {{ error }}",
             "VC_DIAL_ERROR": "Impossible de passer l'appel. Erreur : {{ error }}",
             "VC_COMMAND_ERROR": "La commande de visioconférence a échoué. Erreur : {{ error }}",
             "VC_LEAVE_LOADING": "Hanging up call...",