#45 Fix bug: handle focus after shuffling cards