Changes to keep quick view displayed properly