diff --git a/Xi/exevents.c b/Xi/exevents.c
index 0b312f504..641bead33 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -123,14 +123,9 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count)
     deviceValuator *xV = (deviceValuator *) xE;
 
     if (xE->u.u.type != DeviceValuator) {
-        /* Other types already have root{X,Y} filled in. */
-        if (xE->u.u.type == DeviceKeyPress ||
-            xE->u.u.type == DeviceKeyRelease) {
-	    GetSpritePosition(&rootX, &rootY);
-	    xE->u.keyButtonPointer.rootX = rootX;
-	    xE->u.keyButtonPointer.rootY = rootY;
-        }
-
+	GetSpritePosition(&rootX, &rootY);
+	xE->u.keyButtonPointer.rootX = rootX;
+	xE->u.keyButtonPointer.rootY = rootY;
 	key = xE->u.u.detail;
 	NoticeEventTime(xE);
 	xE->u.keyButtonPointer.state = inputInfo.keyboard->key->state |