DF-2991 scroll cancelling fix