- Performance improvement in the ShortcutListener