diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 8bb0befbe0..d1e1486d61 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -1492,6 +1492,9 @@ InputServer::_SanitizeEvents(EventList& events)
 					PRINT(("new position : %f, %f\n", fMousePos.x, fMousePos.y));
 				}
 
+				if (!event->HasInt64("when"))
+					event->AddInt64("when", system_time());
+
 				event->AddInt32("modifiers", fKeyInfo.modifiers);
 				break;
 	   		}