Make a folder. Move everything into that folder. Make this folder a smart object. Then Save. Then double click on this smart object (the left icon) and it will open in a new windown. Highlight everything and drag it back into your file. You will have to adjust positioning so that it is in the same place. Ref the Smart Object. After its in the right place. Delete the Smart object. Save again. ^ Just worked for me.
... View more