fix return from choice edit