Bug #4258 Grid editing broken

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>