Actually fixing focus/navigation bugs with an ugly hack.