Usually it's sufficient to change `#crm-container` to `.crm-container` as that works for the main content area as well as popups.