Bug 10240: (follow-up) fix display issues