Some tweaks on how the window pops up for bug #8296.