BRANCH 4.2-51: Cleaned up edit to edit_wdg
BRANCH 4.2-51: Hide popup on plugin activation until a better fix is found