diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c
index 286c6fb3b..7d1d81873 100644
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -1902,7 +1902,8 @@ clutter_event_button_new (ClutterEventType        type,
 
   g_set_object (&event->button.source_device, source_device);
 
-  if (tool)
+  if (clutter_input_device_get_device_mode (source_device) ==
+      CLUTTER_INPUT_MODE_FLOATING)
     {
       g_set_object (&event->button.device, source_device);
     }
@@ -1952,7 +1953,8 @@ clutter_event_motion_new (ClutterEventFlags       flags,
 
   g_set_object (&event->motion.source_device, source_device);
 
-  if (tool)
+  if (clutter_input_device_get_device_mode (source_device) ==
+      CLUTTER_INPUT_MODE_FLOATING)
     {
       g_set_object (&event->motion.device, source_device);
     }
@@ -1999,7 +2001,8 @@ clutter_event_scroll_smooth_new (ClutterEventFlags         flags,
 
   g_set_object (&event->scroll.source_device, source_device);
 
-  if (tool)
+  if (clutter_input_device_get_device_mode (source_device) ==
+      CLUTTER_INPUT_MODE_FLOATING)
     {
       g_set_object (&event->scroll.device, source_device);
     }
@@ -2040,7 +2043,8 @@ clutter_event_scroll_discrete_new (ClutterEventFlags       flags,
 
   g_set_object (&event->scroll.source_device, source_device);
 
-  if (tool)
+  if (clutter_input_device_get_device_mode (source_device) ==
+      CLUTTER_INPUT_MODE_FLOATING)
     {
       g_set_object (&event->scroll.device, source_device);
     }
@@ -2072,8 +2076,8 @@ clutter_event_crossing_new (ClutterEventType      type,
                         type == CLUTTER_LEAVE, NULL);
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (source_device), NULL);
 
-  if (!!(clutter_input_device_get_capabilities (source_device) &
-         CLUTTER_INPUT_CAPABILITY_TABLET_TOOL))
+  if (clutter_input_device_get_device_mode (source_device) ==
+      CLUTTER_INPUT_MODE_FLOATING)
     {
       device = source_device;
     }