Feature request - Support more keys in the change-window box