Fix edit mode issues in add CGR screen