Wip/fix shortcuts

Yeah, I fixed that in another PR.