diff --git a/source/Platform/Unix/X11EventQueue.cpp b/source/Platform/Unix/X11EventQueue.cpp
index 19f4177..adcce7f 100644
--- a/source/Platform/Unix/X11EventQueue.cpp
+++ b/source/Platform/Unix/X11EventQueue.cpp
@@ -3,6 +3,7 @@
 #include "X11EventQueue.h"
 #include "X11SharedDisplay.h"
 #include "X11Keyboard.h"
+#include "X11Mouse.h"
 #include "X11WindowEventHandler.h"
 
 namespace sp {
@@ -55,11 +56,10 @@ bool X11EventQueue::poll(Event& event)
 			break;
 		case ButtonPress:
 		case ButtonRelease:
-			Log::info("X11: MouseButtonEvent");
-			break;
 		case MotionNotify:
-			// This generates alot of events :)
-			//Log::info("X11: MouseMotionEvent");
+			if (X11Mouse::handleMessage(&xevent, event)) {
+				return true;
+			}
 			break;
 		default:
 			// Pass to window.