Keyboard shortcuts optimizations (#70, #109)