fix keyboard removal of choices. fixes #1839