CMS-2822 Clicking X to clear page element of a page template or portlet, clears the field above instead.