diff --git a/GUI.NET/Forms/BaseForm.cs b/GUI.NET/Forms/BaseForm.cs
index 59be4a4a..31c9ba06 100644
--- a/GUI.NET/Forms/BaseForm.cs
+++ b/GUI.NET/Forms/BaseForm.cs
@@ -75,13 +75,6 @@ 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);
 		}
 
diff --git a/GUI.NET/Forms/BaseInputForm.cs b/GUI.NET/Forms/BaseInputForm.cs
index 79babbfc..88934eba 100644
--- a/GUI.NET/Forms/BaseInputForm.cs
+++ b/GUI.NET/Forms/BaseInputForm.cs
@@ -29,7 +29,15 @@ namespace Mesen.GUI.Forms
 				CursorManager.ReleaseMouse();
 			}
 
-			return base.ProcessCmdKey(ref msg, keyData);
+			bool result = base.ProcessCmdKey(ref msg, keyData);
+
+			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 result;
 		}
 
 		bool IMessageFilter.PreFilterMessage(ref Message m)