Update window shortcuts
Merge pull request #2639 from darkwing/window-win

Update window shortcuts