Fix the 'close' menu entry and close button when viewing multiple canvases of the...