revised keyboard shortcuts support - fixed issue #2