Fix onChange issue on popup

Fixes RM-2690, RM-2773