Fixes/issue2705 hidden scroll

In addition with #2779 fixes #2705