Patch up dashboard-picking code