Fix editable grid issue (RM-2531)