Bugfix: Fixed shortcuts for live server

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Merge branch 'hotfix/v3.1.3'

* hotfix/v3.1.3:
  Bugfix: Fixed shortcuts for live server