Fix the issue with the save list screen

reviewer: Tiff go (post commit)

Issue: GCP-9168