Fixed dialog hanging up when selecting last choice