@theia/core 1.71.0-next.6 → 1.71.0-next.64

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@theia/core",
-  "version": "1.71.0-next.6+8b1f84c1b",
+  "version": "1.71.0-next.64+5f7caff6d",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@babel/runtime": "^7.10.0",
+    "@babel/runtime": "^7.29.2",
     "@lumino/algorithm": "^2.0.4",
     "@lumino/commands": "^2.3.3",
     "@lumino/coreutils": "^2.2.2",
@@ -16,31 +16,31 @@
     "@lumino/signaling": "^2.1.5",
     "@lumino/virtualdom": "^2.0.4",
     "@lumino/widgets": "2.7.5",
-    "@parcel/watcher": "^2.5.0",
-    "@theia/application-package": "1.71.0-next.6+8b1f84c1b",
-    "@theia/request": "1.71.0-next.6+8b1f84c1b",
-    "@types/body-parser": "^1.16.4",
+    "@parcel/watcher": "^2.5.6",
+    "@theia/application-package": "1.71.0-next.64+5f7caff6d",
+    "@theia/request": "1.71.0-next.64+5f7caff6d",
+    "@types/body-parser": "^1.19.6",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^4.0.2",
     "@types/lodash.debounce": "4.0.3",
-    "@types/lodash.throttle": "^4.1.3",
-    "@types/markdown-it": "^14.1.0",
+    "@types/lodash.throttle": "^4.1.9",
+    "@types/markdown-it": "^14.1.2",
     "@types/markdown-it-emoji": "^3.0.1",
-    "@types/react": "^18.0.15",
-    "@types/react-dom": "^18.0.6",
-    "@types/route-parser": "^0.1.1",
-    "@types/safer-buffer": "^2.1.0",
+    "@types/react": "^18.3.28",
+    "@types/react-dom": "^18.3.7",
+    "@types/route-parser": "^0.1.7",
+    "@types/safer-buffer": "^2.1.3",
     "@types/uuid": "^9.0.8",
-    "@types/ws": "^8.5.5",
+    "@types/ws": "^8.18.1",
     "@types/yargs": "^15",
     "@vscode/codicons": "0.0.45",
-    "ajv": "^6.5.3",
-    "async-mutex": "^0.4.0",
-    "body-parser": "^1.17.2",
-    "cookie": "^1.0.2",
-    "dompurify": "^3.2.4",
+    "ajv": "^6.14.0",
+    "async-mutex": "^0.4.1",
+    "body-parser": "^1.20.4",
+    "cookie": "^1.1.1",
+    "dompurify": "^3.3.3",
     "drivelist": "^12.0.2",
-    "express": "^4.21.0",
+    "express": "^4.22.1",
     "fast-json-stable-stringify": "^2.1.0",
     "file-icons-js": "~1.0.3",
     "font-awesome": "^4.7.0",
@@ -48,32 +48,32 @@
     "fuzzy": "^0.1.3",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
-    "iconv-lite": "^0.6.0",
-    "inversify": "^6.1.3",
-    "jschardet": "^2.1.1",
+    "iconv-lite": "^0.6.3",
+    "inversify": "^6.2.2",
+    "jschardet": "^2.3.0",
     "keytar": "7.9.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
-    "markdown-it": "^14.1.0",
+    "markdown-it": "^14.1.1",
     "markdown-it-anchor": "^9.2.0",
     "markdown-it-emoji": "^3.0.0",
-    "msgpackr": "^1.10.2",
+    "msgpackr": "^1.11.9",
     "p-debounce": "^2.1.0",
     "perfect-scrollbar": "1.5.5",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-tooltip": "^4.2.21",
-    "react-virtuoso": "^2.17.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-tooltip": "^4.5.1",
+    "react-virtuoso": "^2.19.1",
     "reflect-metadata": "^0.2.2",
     "route-parser": "^0.0.5",
     "safer-buffer": "^2.1.2",
-    "socket.io": "^4.5.3",
-    "socket.io-client": "^4.5.3",
+    "socket.io": "^4.8.3",
+    "socket.io-client": "^4.8.3",
     "tslib": "^2.6.2",
     "uuid": "^9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-uri": "3.0.8",
-    "ws": "^8.17.1",
+    "ws": "^8.20.0",
     "yargs": "^15.3.1"
   },
   "peerDependencies": {
@@ -221,5 +221,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "8b1f84c1b0114a76a1f343f3a2935d68faca6927"
+  "gitHead": "5f7caff6d4a136452787442612656962b5c5099e"
 }

package/src/browser/common-frontend-contribution.ts

@@ -718,8 +718,8 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
             execute: title => title?.owner && this.shell.toggleMaximized(title?.owner),
         }));
         commandRegistry.registerCommand(CommonCommands.SHOW_MENU_BAR, {
-            isEnabled: () => !isOSX,
-            isVisible: () => !isOSX,
+            isEnabled: () => !this.isElectron() || !isOSX,
+            isVisible: () => !this.isElectron() || !isOSX,
             execute: () => {
                 const menuBarVisibility = 'window.menuBarVisibility';
                 const visibility = this.preferences[menuBarVisibility];

package/src/browser/components/card.tsx

@@ -15,6 +15,7 @@
 // *****************************************************************************
 
 import * as React from 'react';
+import { buttonKeyboardProps, isActivationKey } from '../keyboard/keyboard-utils';
 
 export interface CardActionButton {
     /** Icon class (e.g., codicon) */
@@ -69,14 +70,22 @@ export const Card = React.memo(function Card(props: CardProps): React.ReactEleme
     } = props;
 
     const isInteractive = onClick !== undefined;
+    const [hasFocus, setHasFocus] = React.useState(false);
 
     const handleKeyDown = React.useCallback((e: React.KeyboardEvent<HTMLDivElement>) => {
-        if (onClick && (e.key === 'Enter' || e.key === ' ')) {
+        if (onClick && isActivationKey(e)) {
             e.preventDefault();
             onClick();
         }
     }, [onClick]);
 
+    const handleFocus = React.useCallback(() => setHasFocus(true), []);
+    const handleBlur = React.useCallback((e: React.FocusEvent<HTMLDivElement>) => {
+        if (!e.currentTarget.contains(e.relatedTarget as Node)) {
+            setHasFocus(false);
+        }
+    }, []);
+
     const cardClasses = [
         'theia-Card',
         isInteractive && 'theia-Card-interactive',
@@ -94,6 +103,8 @@ export const Card = React.memo(function Card(props: CardProps): React.ReactEleme
             role={isInteractive ? 'button' : undefined}
             tabIndex={isInteractive ? 0 : undefined}
             onKeyDown={isInteractive ? handleKeyDown : undefined}
+            onFocus={actionButtons ? handleFocus : undefined}
+            onBlur={actionButtons ? handleBlur : undefined}
         >
             {icon && (
                 <div className={`theia-Card-icon ${icon}`}></div>
@@ -115,7 +126,7 @@ export const Card = React.memo(function Card(props: CardProps): React.ReactEleme
                                     key={i}
                                     className={`theia-Card-action-btn ${btn.iconClass}`}
                                     title={btn.title}
-                                    aria-label={btn.title}
+                                    {...buttonKeyboardProps(btn.title, hasFocus ? 0 : -1)}
                                     onClick={btn.onClick}
                                 />
                             ))}

package/src/browser/connection-status-service.ts

@@ -205,7 +205,7 @@ export class ApplicationConnectionStatusContribution extends DefaultFrontendAppl
     protected handleOffline(): void {
         this.statusBar.setElement(this.statusbarId, {
             alignment: StatusBarAlignment.LEFT,
-            text: nls.localize('theia/core/offline', 'Offline'),
+            text: nls.localizeByDefault('Offline'),
             tooltip: nls.localize('theia/localize/offlineTooltip', 'Cannot connect to backend.'),
             priority: 5000
         });

package/src/browser/keyboard/index.ts

@@ -18,3 +18,4 @@ export * from './keys';
 export * from './keyboard-layout-service';
 export * from './browser-keyboard-layout-provider';
 export * from './browser-keyboard-frontend-contribution';
+export * from './keyboard-utils';

package/src/browser/keyboard/keyboard-utils.ts

@@ -0,0 +1,37 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/**
+ * Query whether the keyboard event represents an element activation.
+ * That is, whether the user pressed `Enter` or `Space` on a focusable
+ * element with `role="button"` or similar interactive role.
+ */
+export function isActivationKey(e: React.KeyboardEvent | KeyboardEvent): boolean {
+    return e.key === 'Enter' || e.key === ' ';
+}
+
+/**
+ * Returns the ARIA/accessibility props that make a non-button HTML element
+ * keyboard-navigable and screen-reader-accessible as a button.
+ *
+ * Spread these onto the element alongside `onClick` and `onKeyDown`:
+ * ```tsx
+ * <div {...buttonKeyboardProps(label)} onClick={handler} onKeyDown={e => isActivationKey(e) && handler()} />
+ * ```
+ */
+export function buttonKeyboardProps(ariaLabel: string, tabIndex = 0): React.HTMLAttributes<HTMLElement> {
+    return { tabIndex, role: 'button', 'aria-label': ariaLabel };
+}

package/src/browser/menu/browser-menu-plugin.ts

@@ -143,7 +143,14 @@ export class DynamicMenuBarWidget extends MenuBarWidget {
     protected previousFocusedElement: HTMLElement | undefined;
 
     constructor() {
-        super();
+        // Disable Lumino's overflow menu feature. The feature has a bug where
+        // `onUpdateRequest` consumes a stale `_overflowIndex` (only recomputed at the
+        // end of the method), which causes a RangeError when the menu bar is rendered
+        // at zero width. Additionally, Theia's CSS does not constrain the menu bar's
+        // offsetWidth to the available space, so the overflow detection never triggers.
+        // See https://github.com/eclipse-theia/theia/issues/17352
+        // See https://github.com/jupyterlab/lumino/issues/811
+        super({ overflowMenuOptions: { isVisible: false } });
         // HACK we need to hook in on private method _openChildMenu. Don't do this at home!
         DynamicMenuBarWidget.prototype['_openChildMenu'] = () => {
             if (this.activeMenu instanceof DynamicMenuWidget) {

package/src/browser/messaging/messaging-frontend-module.ts

@@ -21,10 +21,13 @@ import { LocalConnectionProvider, RemoteConnectionProvider, ServiceConnectionPro
 import { ConnectionSource } from './connection-source';
 import { ConnectionCloseService, connectionCloseServicePath } from '../../common/messaging/connection-management';
 import { WebSocketConnectionProvider } from './ws-connection-provider';
+import { SocketWriteBuffer } from '../../common/messaging/socket-write-buffer';
 
 const backendServiceProvider = Symbol('backendServiceProvider');
 
 export const messagingFrontendModule = new ContainerModule(bind => {
+    // Transient: each connection source gets its own private buffer instance.
+    bind(SocketWriteBuffer).toSelf();
     bind(ConnectionCloseService).toDynamicValue(ctx => WebSocketConnectionProvider.createProxy(ctx.container, connectionCloseServicePath)).inSingletonScope();
     bind(BrowserFrontendIdProvider).toSelf().inSingletonScope();
     bind(FrontendIdProvider).toService(BrowserFrontendIdProvider);

package/src/browser/messaging/ws-connection-source.ts

@@ -33,7 +33,8 @@ export class WebSocketConnectionSource implements ConnectionSource {
     @inject(FrontendIdProvider)
     protected readonly frontendIdProvider: FrontendIdProvider;
 
-    private readonly writeBuffer = new SocketWriteBuffer();
+    @inject(SocketWriteBuffer)
+    protected readonly writeBuffer: SocketWriteBuffer;
 
     private _socket: Socket;
     get socket(): Socket {
@@ -135,8 +136,8 @@ export class WebSocketConnectionSource implements ConnectionSource {
 
     connectNewChannel(): void {
         if (this.currentChannel) {
-            this.currentChannel.close();
             this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
+            this.currentChannel.close();
         }
         this.writeBuffer.drain();
         this.currentChannel = this.createChannel();

package/src/browser/saveable-service.ts

@@ -22,6 +22,7 @@ import { AutoSaveMode, Saveable, SaveableSource, SaveableWidget, SaveOptions, Sa
 import { waitForClosed, Widget } from './widgets';
 import { FrontendApplicationContribution } from './frontend-application-contribution';
 import { FrontendApplication } from './frontend-application';
+import { WindowFocusService } from './window/window-focus-service';
 import throttle = require('lodash.throttle');
 
 export const SaveErrorChecker = Symbol('SaveErrorChecker');
@@ -49,6 +50,9 @@ export class SaveableService implements FrontendApplicationContribution {
     @inject(ContributionProvider) @named(SaveErrorChecker)
     protected readonly errorCheckers: ContributionProvider<SaveErrorChecker>;
 
+    @inject(WindowFocusService)
+    protected readonly windowFocusService: WindowFocusService;
+
     protected saveThrottles = new Map<Widget, AutoSaveThrottle>();
     protected saveMode: AutoSaveMode = 'off';
     protected saveDelay = 1000;
@@ -131,6 +135,35 @@ export class SaveableService implements FrontendApplicationContribution {
             this.saveThrottles.get(e)?.dispose();
             this.saveThrottles.delete(e);
         });
+        // Save all dirty editors when any application window loses focus
+        this.windowFocusService.onDidWindowChangeFocus(({ hasFocus }) => {
+            if (!hasFocus) {
+                this.saveOnWindowBlur();
+            }
+        });
+    }
+
+    /**
+     * Save all dirty saveables when the application window loses focus.
+     * Triggered for both `onFocusChange` and `onWindowChange` auto-save modes,
+     * matching VSCode's behavior where a window focus loss is a superset of
+     * editor focus loss.
+     */
+    protected saveOnWindowBlur(): void {
+        if (this.saveMode !== 'onWindowChange' && this.saveMode !== 'onFocusChange') {
+            return;
+        }
+        if (!this.shell) {
+            return;
+        }
+        for (const widget of this.shell.widgets) {
+            const saveable = Saveable.get(widget);
+            if (saveable && this.shouldAutoSave(widget, saveable)) {
+                saveable.save({
+                    saveReason: SaveReason.FocusChange
+                });
+            }
+        }
     }
 
     protected updateAutoSaveMode(mode: AutoSaveMode): void {
@@ -169,39 +202,13 @@ export class SaveableService implements FrontendApplicationContribution {
                         saveReason: SaveReason.AfterDelay
                     });
                 }
-            },
-            this.addBlurListener(widget, saveable)
+            }
         );
         this.saveThrottles.set(widget, saveThrottle);
         this.applySaveableWidget(widget, saveable);
         return saveThrottle;
     }
 
-    protected addBlurListener(widget: Widget, saveable: Saveable): Disposable {
-        const document = widget.node.ownerDocument;
-        const listener = (() => {
-            if (this.saveMode === 'onWindowChange' && !this.windowHasFocus(document) && this.shouldAutoSave(widget, saveable)) {
-                saveable.save({
-                    saveReason: SaveReason.FocusChange
-                });
-            }
-        }).bind(this);
-        document.addEventListener('blur', listener);
-        return Disposable.create(() => {
-            document.removeEventListener('blur', listener);
-        });
-    }
-
-    protected windowHasFocus(document: Document): boolean {
-        if (document.visibilityState === 'hidden') {
-            return false;
-        } else if (document.hasFocus()) {
-            return true;
-        }
-        // TODO: Add support for iframes
-        return false;
-    }
-
     protected shouldAutoSave(widget: Widget, saveable: Saveable): boolean {
         const uri = NavigatableWidget.getUri(widget);
         if (uri?.scheme === UNTITLED_SCHEME) {

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx

@@ -16,6 +16,7 @@
 
 import { inject, injectable, postConstruct } from 'inversify';
 import * as React from 'react';
+import { buttonKeyboardProps, isActivationKey } from '../../keyboard/keyboard-utils';
 import { ContextKeyService } from '../../context-key-service';
 import { CommandRegistry, Disposable, DisposableCollection, nls } from '../../../common';
 import { Anchor, ContextMenuAccess, ContextMenuRenderer } from '../../context-menu-renderer';
@@ -150,7 +151,10 @@ export class TabBarToolbar extends ReactWidget {
 
     protected renderMore(): React.ReactNode {
         return !!this.more.size && <div key='__more__' className={TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled'}>
-            <div id='__more__' className={codicon('ellipsis', true)} onClick={this.showMoreContextMenu}
+            <div id='__more__' className={codicon('ellipsis', true)}
+                {...buttonKeyboardProps(nls.localizeByDefault('More Actions...'))}
+                onClick={this.showMoreContextMenu}
+                onKeyDown={this.handleMoreKeyDown}
                 title={nls.localizeByDefault('More Actions...')} />
         </div>;
     }
@@ -162,6 +166,15 @@ export class TabBarToolbar extends ReactWidget {
         this.renderMoreContextMenu(anchor);
     };
 
+    protected handleMoreKeyDown = (event: React.KeyboardEvent) => {
+        if (isActivationKey(event)) {
+            event.preventDefault();
+            event.stopPropagation();
+            const { left, bottom } = (event.currentTarget as HTMLElement).getBoundingClientRect();
+            this.renderMoreContextMenu({ x: left, y: bottom });
+        }
+    };
+
     renderMoreContextMenu(anchor: Anchor): ContextMenuAccess {
         const toDisposeOnHide = new DisposableCollection();
         this.addClass('menu-open');

package/src/browser/shell/tab-bar-toolbar/tab-toolbar-item.tsx

@@ -23,6 +23,7 @@ import { KeybindingRegistry } from '../../keybinding';
 import { ACTION_ITEM } from '../../widgets';
 import { TabBarToolbar } from './tab-bar-toolbar';
 import * as React from 'react';
+import { buttonKeyboardProps, isActivationKey } from '../../keyboard/keyboard-utils';
 import { ActionMenuNode, GroupImpl, MenuNode } from '../../../common/menu';
 
 export interface TabBarToolbarItem {
@@ -195,16 +196,24 @@ export class RenderedToolbarItemImpl extends AbstractToolbarItemImpl<RenderedToo
     };
 
     protected executeCommand(e: React.MouseEvent<HTMLElement>, widget: Widget): void {
+        this.doExecuteCommand(e, widget);
+    };
+
+    protected doExecuteCommand(e: React.SyntheticEvent<HTMLElement>, widget: Widget): void {
         e.preventDefault();
         e.stopPropagation();
-
         if (!this.isEnabled(widget)) {
             return;
         }
-
         if (this.action.command) {
             this.commandRegistry.executeCommand(this.action.command, widget);
         }
+    }
+
+    protected onKeyDownEvent = (e: React.KeyboardEvent<HTMLElement>, widget: Widget) => {
+        if (isActivationKey(e)) {
+            this.doExecuteCommand(e, widget);
+        }
     };
 
     protected renderItem(widget: Widget): React.ReactNode {
@@ -249,7 +258,9 @@ export class RenderedToolbarItemImpl extends AbstractToolbarItemImpl<RenderedToo
             onMouseUp={this.onMouseUpEvent}
             onMouseOut={this.onMouseUpEvent} >
             <div id={this.action.id} className={classNames.join(' ')}
+                {...buttonKeyboardProps(tooltip)}
                 onClick={e => this.executeCommand(e, widget)}
+                onKeyDown={e => this.onKeyDownEvent(e, widget)}
                 title={tooltip} > {innerText}
             </div>
         </div>;

package/src/browser/style/card.css

@@ -101,11 +101,13 @@
     transition: opacity 0.15s;
 }
 
-.theia-Card:hover .theia-Card-footer-time {
+.theia-Card:hover .theia-Card-footer-time,
+.theia-Card:focus-within .theia-Card-footer-time {
     opacity: 0;
 }
 
-.theia-Card:hover .theia-Card-footer-actions {
+.theia-Card:hover .theia-Card-footer-actions,
+.theia-Card:focus-within .theia-Card-footer-actions {
     opacity: 1;
     pointer-events: auto;
 }

package/src/browser/style/hover-service.css

@@ -30,6 +30,8 @@
   padding: var(--theia-ui-padding);
   max-width: var(--theia-hover-max-width);
   user-select: text;
+  --vscode-scmGraph-historyItemHoverAdditionsForeground: var(--theia-scmGraph-historyItemHoverAdditionsForeground);
+  --vscode-scmGraph-historyItemHoverDeletionsForeground: var(--theia-scmGraph-historyItemHoverDeletionsForeground);
 }
 
 /* overwrite potentially different default user agent styles */
@@ -60,6 +62,11 @@
   background-color: var(--theia-editorHoverWidget-statusBarBackground);
 }
 
+.theia-hover .codicon {
+  vertical-align: middle;
+  margin-bottom: 2px;
+}
+
 .theia-hover code {
   background-color: var(--theia-textCodeBlock-background);
   font-family: var(--theia-code-font-family);

package/src/browser/window/browser-window-module.ts

@@ -24,6 +24,7 @@ import { SecondaryWindowService } from './secondary-window-service';
 import { DefaultSecondaryWindowService } from './default-secondary-window-service';
 import { bindRootContributionProvider } from '../../common';
 import { WindowTitleContribution } from './window-title-service';
+import { WindowFocusService } from './window-focus-service';
 
 export default new ContainerModule(bind => {
     bind(DefaultWindowService).toSelf().inSingletonScope();
@@ -31,5 +32,6 @@ export default new ContainerModule(bind => {
     bind(FrontendApplicationContribution).toService(DefaultWindowService);
     bind(ClipboardService).to(BrowserClipboardService).inSingletonScope();
     bind(SecondaryWindowService).to(DefaultSecondaryWindowService).inSingletonScope();
+    bind(WindowFocusService).toSelf().inSingletonScope();
     bindRootContributionProvider(bind, WindowTitleContribution);
 });

package/src/browser/window/default-secondary-window-service.ts

@@ -22,6 +22,7 @@ import { Saveable } from '../saveable';
 import { Emitter, environment, Event, PreferenceService } from '../../common';
 import { SaveableService } from '../saveable-service';
 import { getAllWidgetsFromSecondaryWindow, getDefaultRestoreArea } from '../secondary-window-handler';
+import { WindowFocusService } from './window-focus-service';
 
 @injectable()
 export class DefaultSecondaryWindowService implements SecondaryWindowService {
@@ -53,6 +54,9 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
     @inject(SaveableService)
     protected readonly saveResourceService: SaveableService;
 
+    @inject(WindowFocusService)
+    protected readonly windowFocusService: WindowFocusService;
+
     @postConstruct()
     init(): void {
         // Set up messaging with secondary windows
@@ -106,6 +110,7 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
             this.secondaryWindows.push(newWindow);
             this.onWindowOpenedEmitter.fire(newWindow);
             newWindow.addEventListener('DOMContentLoaded', () => {
+                const focusRegistration = this.windowFocusService.registerWindow(newWindow);
                 newWindow.addEventListener('beforeunload', evt => {
                     const widgets = getAllWidgetsFromSecondaryWindow(newWindow) ?? [widget];
                     for (const w of widgets) {
@@ -120,6 +125,7 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
                 }, { capture: true });
 
                 newWindow.addEventListener('unload', () => {
+                    focusRegistration.dispose();
                     const extIndex = this.secondaryWindows.indexOf(newWindow);
                     if (extIndex > -1) {
                         this.onWindowClosedEmitter.fire(newWindow);