Fix bug 1034498, 1034586 - Site Flicker

Should prevent the slight style flicker