diff --git a/components/ideintf/toolbarintf.pas b/components/ideintf/toolbarintf.pas index f2da6e3c33..a0a68a5e00 100644 --- a/components/ideintf/toolbarintf.pas +++ b/components/ideintf/toolbarintf.pas @@ -327,6 +327,8 @@ var ActiveEditor: TSourceEditorInterface; ScreenXY: TPoint; begin + if ActivePopupMenu <> nil then // work around for issue #40161 + exit; ActiveEditor := SourceEditorManagerIntf.ActiveEditor; if ActiveEditor=nil then Exit;