Fixed issue with form dialog