diff --git a/web/src/components/modals/export-modal.tsx b/web/src/components/modals/export-modal.tsx index 4bbf59c1e..fd9381664 100644 --- a/web/src/components/modals/export-modal.tsx +++ b/web/src/components/modals/export-modal.tsx @@ -124,15 +124,17 @@ export const ExportModal: React.FC = ({ }, [isExportAll, selectedColumns]); React.useEffect(() => { - // reload selected columns when config is loaded - setSelectedColumns( - getLocalStorage(LOCAL_STORAGE_EXPORT_COLS_KEY, columns, { - id: 'id', - criteria: 'isSelected' - }) - ); + // reload selected columns when config is loaded and popup closed + if (!isModalOpen) { + setSelectedColumns( + getLocalStorage(LOCAL_STORAGE_EXPORT_COLS_KEY, _.cloneDeep(columns), { + id: 'id', + criteria: 'isSelected' + }) + ); + } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [columns]); + }, [isModalOpen, columns]); return (