Perhaps we need to rehaul the entire Editor component. My 2 cents.