improve check for shortcut entry