diff --git a/src/servers/app/RootLayer.cpp b/src/servers/app/RootLayer.cpp
index a88c21a646..03ac87f689 100644
--- a/src/servers/app/RootLayer.cpp
+++ b/src/servers/app/RootLayer.cpp
@@ -983,7 +983,7 @@ void RootLayer::MouseEventHandler(int32 code, BPortLink& msg)
 
 			if (fLastMouseMoved->EventMask() & B_POINTER_EVENTS)
 			{
-				fEventMaskLayer = target;
+				fEventMaskLayer = fLastMouseMoved;
 			}
 
 			// We'll need this so that GetMouse can query for which buttons