Fix small but significant behaviour oddities in the context editor