Added ability to disable focus override