Amend c8c7fc18af5f to handle window resize-tiggered updated

Issue #1787