#6 Fix scroll disabling