Keyboard shortcut bug fixed: #6