diff --git a/Source/OpenTK/Platform/LegacyInputDriver.cs b/Source/OpenTK/Platform/LegacyInputDriver.cs
index 50d00deb..2378b91b 100644
--- a/Source/OpenTK/Platform/LegacyInputDriver.cs
+++ b/Source/OpenTK/Platform/LegacyInputDriver.cs
@@ -67,15 +67,8 @@ namespace OpenTK.Platform
             window.MouseWheel += mouse.HandleMouseWheel;
 
             // Hook keyboard events
-            window.KeyDown += (sender, e) =>
-            {
-                keyboard.SetKey(e.Key, e.ScanCode, e.Modifiers, true);
-            };
-
-            window.KeyUp += (sender, e) =>
-            {
-                keyboard.SetKey(e.Key, e.ScanCode, e.Modifiers, false);
-            };
+            window.KeyDown += keyboard.HandleKeyDown;
+            window.KeyUp += keyboard.HandleKeyUp;
 
             window.FocusedChanged += (sender, e) =>
             {