#3579438: Fix remaining scrolling issues

Closes #3579438

Merge request reports

Loading