Better handling when switching between editor modes

#244