diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index 4eec2205d..d6755cb22 100644
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -575,7 +575,7 @@ clutter_event_get_device (ClutterEvent *event)
 
     case CLUTTER_KEY_PRESS:
     case CLUTTER_KEY_RELEASE:
-      device = event->scroll.device;
+      device = event->key.device;
       break;
     }
 
diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c
index 1a465a383..28bb4b3ab 100644
--- a/clutter/x11/clutter-event-x11.c
+++ b/clutter/x11/clutter-event-x11.c
@@ -667,7 +667,7 @@ event_translate (ClutterBackend *backend,
       event->key.type = event->type = CLUTTER_KEY_PRESS;
       event->key.device =
         clutter_device_manager_get_core_device (manager,
-                                                CLUTTER_POINTER_DEVICE);
+                                                CLUTTER_KEYBOARD_DEVICE);
 
       translate_key_event (backend, event, xevent);