Fix scroll bar gap

Closes #1437