FIX: Ensure available widgets list is consistent between versions (#6292)