This fixes a regression where applying menu swaps post-shift would make shift effectively do nothing. Instead use the client swap when shift is held.