I think this can be improved further by adding a entry->hide() here.

With this patch it looks like there are two entries for a very slight moment.