diff --git a/source/Platform/Unix/X11EventQueue.cpp b/source/Platform/Unix/X11EventQueue.cpp
index a552643..06438e4 100644
--- a/source/Platform/Unix/X11EventQueue.cpp
+++ b/source/Platform/Unix/X11EventQueue.cpp
@@ -2,6 +2,7 @@
 #include <Spectre/System/Log.h>
 #include "X11EventQueue.h"
 #include "X11SharedDisplay.h"
+#include "X11Keyboard.h"
 #include "X11WindowEventHandler.h"
 
 namespace sp {
@@ -48,7 +49,9 @@ bool X11EventQueue::poll(Event& event)
 			break;
 		case KeyPress:
 		case KeyRelease:
-			Log::info("X11: KeyEvent");
+			if (X11Keyboard::handleMessage(&xevent.xkey, event)) {
+				return true;
+			}
 			break;
 		case ButtonPress:
 		case ButtonRelease: