Prevent editCell click events from propagating

Fix #2378 mostly