1.4 release hotfix 3

Fixed shortcuts handling