diff --git a/UI/Forms/BaseForm.cs b/UI/Forms/BaseForm.cs index 23c55ab..983d955 100644 --- a/UI/Forms/BaseForm.cs +++ b/UI/Forms/BaseForm.cs @@ -39,6 +39,13 @@ namespace Mesen.GUI.Forms { bool processed = false; OnProcessCmdKey?.Invoke(keyData, ref processed); + + if(keyData == Keys.F10 || keyData == (Keys.F10 | Keys.Shift)) { + //Prevent default Windows behavior on F10 / Shift+F10 presses, which causes issues + //such as the Shift key not being processed as being released, etc. + return true; + } + return processed || base.ProcessCmdKey(ref msg, keyData); }