if this is for focus management, maybe it's better in a separate patch?