Fix for persisting cell selection