Follow-up fix for bug#6802 - consider window resize properly.