Fix cell keyboard selection and cell edit conflict