diff --git a/app/display/gimpmodifiersmanager.c b/app/display/gimpmodifiersmanager.c
index 944b29f5e6..2e92d30296 100644
--- a/app/display/gimpmodifiersmanager.c
+++ b/app/display/gimpmodifiersmanager.c
@@ -518,6 +518,9 @@ gimp_modifiers_manager_get_keys (GdkDevice        *device,
 
   g_return_if_fail (GDK_IS_DEVICE (device) || device == NULL);
 
+  if (device && gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_MASTER)
+    device = NULL;
+
   vendor_id  = device ? gdk_device_get_vendor_id (device) : NULL;
   product_id = device ? gdk_device_get_product_id (device) : NULL;
   modifiers  = modifiers & gimp_get_all_modifiers_mask ();