Revert "Revert "ScrollPane fix""

This reverts commit 6696c9dfca21f00a8bd6044055272f5e4947c644.