Unbreak Editor loading a new editor with same canvas, but new session & controllers

Fixup to #282