Wip/fix shortcuts

I invite you to test merge/sbt-rc-ui and see if it feels better for you as well.