2.5.2-16 Closing Windows

Users should be able to close a window with a single action.