[ALOY-927] Support keyboard and return key type shortcuts
Merge pull request #375 from skypanther/ALOY-927

[ALOY-927] Support keyboard and return key type shortcuts