am 8835aed7: am fb812e56: fix shortcut handling

* commit '8835aed78de8fbe6a76df5b15a6c4ebf7852e337':
  fix shortcut handling