CRM-13863 - Ensure scrollbars get re-enabled