Fixed window switching when paged
Merge branch 'master' into plugins