Fix new widget modal form issues.