diff --git a/src/move.c b/src/move.c
index 10f5914b..b860ad1a 100644
--- a/src/move.c
+++ b/src/move.c
@@ -338,6 +338,7 @@ char MoveClientKeyboard(ClientNode *np)
    } else {
       height = np->height;
    }
+   currentClient = np;
 
    for(;;) {