Window entry update (replaces #2813)