Archived: Fixes overlap calculations on focus

#4119