Work on popups on generic edit