Add code to focus "correctly"