Fix scroll propagation

This is waht #1334 was supposed to be.