More sidebar bouncing fixes