diff --git a/GUI.NET/Controls/ctrlMesenMenuStrip.cs b/GUI.NET/Controls/ctrlMesenMenuStrip.cs index 2d4d29ec..78836023 100644 --- a/GUI.NET/Controls/ctrlMesenMenuStrip.cs +++ b/GUI.NET/Controls/ctrlMesenMenuStrip.cs @@ -13,7 +13,7 @@ namespace Mesen.GUI.Controls protected override void WndProc(ref Message m) { if(m.Msg == WM_MOUSEACTIVATE && this.CanFocus && !this.Focused) { - this.Focus(); + this.FindForm()?.Focus(); } base.WndProc(ref m); } diff --git a/GUI.NET/Controls/ctrlMesenToolStrip.cs b/GUI.NET/Controls/ctrlMesenToolStrip.cs index ea2397ee..4a76f2f6 100644 --- a/GUI.NET/Controls/ctrlMesenToolStrip.cs +++ b/GUI.NET/Controls/ctrlMesenToolStrip.cs @@ -13,7 +13,7 @@ namespace Mesen.GUI.Controls protected override void WndProc(ref Message m) { if(m.Msg == WM_MOUSEACTIVATE && this.CanFocus && !this.Focused) { - this.Focus(); + this.FindForm()?.Focus(); } base.WndProc(ref m); }