diff --git a/QtPyLoT.py b/QtPyLoT.py
index 04843932..ec609a59 100755
--- a/QtPyLoT.py
+++ b/QtPyLoT.py
@@ -2550,6 +2550,7 @@ class MainWindow(QMainWindow):
         self.project.save(filename)
         self.setDirty(False)
         self.saveProjectAsAction.setEnabled(True)
+        self.exportAllEvents()
         self.update_status('Saved new project to {}'.format(filename), duration=5000)
         return True
 
@@ -2565,6 +2566,7 @@ class MainWindow(QMainWindow):
             else:
                 self.project.parameter = self._inputs
                 self.project.save()
+                self.exportAllEvents()
             if not self.project.dirty:
                 self.update_status('Saved back project to file:\n{}'.format(self.project.location), duration=5000)
                 self.setDirty(False)
diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py
index 85f1b9df..2c584426 100644
--- a/pylot/core/util/widgets.py
+++ b/pylot/core/util/widgets.py
@@ -2869,6 +2869,7 @@ class AutoPickDlg(QDialog):
         self.gb.setLayout(self.jobLayout)
 
     def exportParameter(self):
+        self.parent().exportAllEvents()
         pylot_params = self.parent()._inputs
         self.addEvents2pp(pylot_params)
         pylot_params.export2File(self.pp_export)