Fix items list freezing in some situations