Fix focus history
Fix focus history