On selection, close picker + simplified logic