#36 - Fixed: Shortcuts work again