Fix introduced bug when preventing to move when choices are shown