diff --git a/Source/OpenTK/Input/KeyboardDevice.cs b/Source/OpenTK/Input/KeyboardDevice.cs
index cc7d5319..9544f420 100644
--- a/Source/OpenTK/Input/KeyboardDevice.cs
+++ b/Source/OpenTK/Input/KeyboardDevice.cs
@@ -211,12 +211,14 @@ namespace OpenTK.Input
                 {
                     args.Key = key;
                     args.ScanCode = scancode;
+                    args.Modifiers = GetModifiers();
                     KeyDown(this, args);
                 }
                 else if (!state && KeyUp != null)
                 {
                     args.Key = key;
                     args.ScanCode = scancode;
+                    args.Modifiers = GetModifiers();
                     KeyUp(this, args);
                 }
             }