Merge "Fixes a bug in shortcut key." into nyc-dev