--- unity-control-center-15.04.0+16.04.20160705/panels/mouse/gsd-input-helper.c
+++ unity-control-center-15.04.0+16.04.20160705+mouse/panels/mouse/gsd-input-helper.c
@@ -191,7 +191,8 @@
 gboolean
 device_info_is_mouse (XDeviceInfo *device_info)
 {
-        return (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_MOUSE, False));
+        return ((device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_MOUSE, False)) ||
+		((device_info->use == IsXExtensionPointer) && (device_info->type == XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_KEYBOARD, False))));
 }
 
 static gboolean