diff --git a/packages/apputils/src/toolbar.tsx b/packages/apputils/src/toolbar.tsx index be5d80976a16..fd225adc1634 100644 --- a/packages/apputils/src/toolbar.tsx +++ b/packages/apputils/src/toolbar.tsx @@ -327,9 +327,13 @@ export class Toolbar extends Widget { * Handle a DOM click event. */ protected handleClick(event: Event) { - // Clicking a label focuses the corresponding control, so let it be. + // Clicking a label focuses the corresponding control + // that is linked with `for` attribute, so let it be. if (event.target instanceof HTMLLabelElement) { - return; + const forId = event.target.getAttribute('for'); + if (forId && this.node.querySelector(`#${forId}`)) { + return; + } } // If this click already focused a control, let it be.