Deal modal full-edit fix