issue 2225 & 2277 - ScrollView cut off at bottom

this does it