Addresses #168, moving to different clusters from within the canvas works correctly now.