CMS-4090 Responsiveness not correct when refreshing whole page