CON-2309 change logic slightly for touch screens