I don't like the behavior of no-scroll as is

Signed-off-by: Cristian Stoica <crististm@gmail.com>