CMS-1592 DeleteWindow lacks margin