Handle scroll bar more gracefully.  Refs #2854

Change-Id: Iad4f32033724dad80fafd073eb215f89c346e931