Refactor to shared focus_notify