Fixes issue #124. Used to be visually nicer but I can't do anything else yet. Will come back when we redesign the editor