Fix scroll event handling