Bug: Clicking a canvas sometimes changes the layout

Yay this is fixed now - on to the next related bug: