Add Products dialog not saving selected custom layout

When adding accessory to an item, the 'Add Products' window is not saving the chosen custom layout. It has to be re-selected each time. This needs to be persistent across all add products windows.