diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index f7abfe75b5..43e9c9f01a 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -414,6 +414,9 @@ gdk_event_alloc (GdkEventType event_type,
   event->device = device != NULL ? g_object_ref (device) : NULL;
   event->time = time_;
 
+  if (device != NULL && time_ != GDK_CURRENT_TIME)
+    gdk_device_set_timestamp (device, time_);
+
   return event;
 }