1 files changed, 1 insertions, 1 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index a57139f35..4557350bf 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5883,7 +5883,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    nkn.changed|= XkbNKN_GeometryMask;
 	XkbSendNewKeyboardNotify(dev,&nkn);
 
-	if (!IsMaster(dev) && dev->u.master)
+	if (!IsMaster(dev) && !IsFloating(dev))
 	{
 	    DeviceIntPtr master = dev->u.master;
 	    if (master->u.lastSlave == dev)