Use window shortcut, update quote type
Merge pull request #1732 from darkwing/modal-cleanup

Use window shortcut, update quote type