am fb812e56: fix shortcut handling

* commit 'fb812e56f41c1b1f0f28773b01b60e1ec0c242a6':
  fix shortcut handling