[FIX] Do not confirm picking until we change the location