diff --git a/reactos/subsystems/win32/win32k/include/msgqueue.h b/reactos/subsystems/win32/win32k/include/msgqueue.h
index 8b6eeddf998..fd11f162409 100644
--- a/reactos/subsystems/win32/win32k/include/msgqueue.h
+++ b/reactos/subsystems/win32/win32k/include/msgqueue.h
@@ -301,7 +301,7 @@ VOID APIENTRY MsqRemoveWindowMessagesFromQueue(PVOID pWindow); /* F*(&$ headers,
             (message >= WM_MOUSEFIRST && message <= WM_MOUSELAST))
 
 #define IS_KBD_MESSAGE(message) \
-    (message == WM_KEYDOWN || message == WM_KEYUP)
+    (message >= WM_KEYFIRST && message <= WM_KEYLAST)
 
 HANDLE FASTCALL
 IntMsqSetWakeMask(DWORD WakeMask);