diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs index a14a5ac354c..a7d78660e5e 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs @@ -4578,6 +4578,9 @@ protected override void WndProc(ref Message m) if (m.MsgInternal == PInvokeCore.WM_SETFOCUS) { SnapFocus((HWND)(nint)m.WParamInternal); + + // For fix https://github.com/dotnet/winforms/issues/12916 + ToolStripManager.ModalMenuFilter.SetActiveToolStrip(this); } if (!AllowClickThrough && m.MsgInternal == PInvokeCore.WM_MOUSEACTIVATE)