Fix the edit  dialogs