Fix issues with scroll panes inside navigation/context