Fixed bug where a screen would become unusable after leaving the override screen during an override