Fix flash of empty list view, take 2. (#458)