diff --git a/pylot/core/active/ActiveSeismoPick3D_GUI.py b/pylot/core/active/ActiveSeismoPick3D_GUI.py
index 5318295c..d7e9fd9f 100755
--- a/pylot/core/active/ActiveSeismoPick3D_GUI.py
+++ b/pylot/core/active/ActiveSeismoPick3D_GUI.py
@@ -35,6 +35,7 @@ class gui_control(object):
         self.printSurveyTextbox()
         self.printSeisArrayTextbox()
         self.initWindowObjects()
+        app.aboutToQuit.connect(self.exitApp)
 
     def initWindowObjects(self):
         self.gsa = None
@@ -519,6 +520,11 @@ class gui_control(object):
         return self.survey.picked
 
     def exitApp(self):
+        if self.checkSurveyState():
+            if continueDialogMessage('Do you want to save the current Survey?'):
+                self.save_survey()
+            else:
+                return
         QtCore.QCoreApplication.instance().quit()
 
 
diff --git a/pylot/core/active/gui/asp3d_layout.py b/pylot/core/active/gui/asp3d_layout.py
index b5fd7f2c..f355de1a 100644
--- a/pylot/core/active/gui/asp3d_layout.py
+++ b/pylot/core/active/gui/asp3d_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'asp3d_layout.ui'
 #
-# Created: Wed Aug 24 14:38:12 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
diff --git a/pylot/core/active/gui/fmtomo_parameters_layout.py b/pylot/core/active/gui/fmtomo_parameters_layout.py
index 9f176c4b..d12b6317 100644
--- a/pylot/core/active/gui/fmtomo_parameters_layout.py
+++ b/pylot/core/active/gui/fmtomo_parameters_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'fmtomo_parameters_layout.ui'
 #
-# Created: Wed Aug 24 14:38:12 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
diff --git a/pylot/core/active/gui/generate_seisarray_layout.py b/pylot/core/active/gui/generate_seisarray_layout.py
index c6eb962b..e22b7488 100644
--- a/pylot/core/active/gui/generate_seisarray_layout.py
+++ b/pylot/core/active/gui/generate_seisarray_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'generate_seisarray_layout.ui'
 #
-# Created: Wed Aug 24 14:38:13 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
diff --git a/pylot/core/active/gui/generate_survey_layout.py b/pylot/core/active/gui/generate_survey_layout.py
index 537f00ff..8afada23 100644
--- a/pylot/core/active/gui/generate_survey_layout.py
+++ b/pylot/core/active/gui/generate_survey_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'generate_survey_layout.ui'
 #
-# Created: Wed Aug 24 14:38:13 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
diff --git a/pylot/core/active/gui/generate_survey_layout_minimal.py b/pylot/core/active/gui/generate_survey_layout_minimal.py
index 9d272479..c33302be 100644
--- a/pylot/core/active/gui/generate_survey_layout_minimal.py
+++ b/pylot/core/active/gui/generate_survey_layout_minimal.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'generate_survey_layout_minimal.ui'
 #
-# Created: Wed Aug 24 14:38:13 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
diff --git a/pylot/core/active/gui/picking_parameters_layout.py b/pylot/core/active/gui/picking_parameters_layout.py
index f0858c14..a6b2c3f2 100644
--- a/pylot/core/active/gui/picking_parameters_layout.py
+++ b/pylot/core/active/gui/picking_parameters_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'picking_parameters_layout.ui'
 #
-# Created: Wed Aug 24 14:38:13 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
diff --git a/pylot/core/active/gui/postprocessing_layout.py b/pylot/core/active/gui/postprocessing_layout.py
index cf8803c7..0cb3d539 100644
--- a/pylot/core/active/gui/postprocessing_layout.py
+++ b/pylot/core/active/gui/postprocessing_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'postprocessing_layout.ui'
 #
-# Created: Wed Aug 24 14:38:13 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -167,7 +167,7 @@ class Ui_postprocessing(object):
         self.label.setText(QtGui.QApplication.translate("postprocessing", "Selection", None, QtGui.QApplication.UnicodeUTF8))
         self.pushButton_rect.setText(QtGui.QApplication.translate("postprocessing", "Rectangle", None, QtGui.QApplication.UnicodeUTF8))
         self.pushButton_poly.setText(QtGui.QApplication.translate("postprocessing", "Polygon", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton_undo.setText(QtGui.QApplication.translate("postprocessing", "Undo", None, QtGui.QApplication.UnicodeUTF8))
+        self.pushButton_undo.setText(QtGui.QApplication.translate("postprocessing", "Unselect", None, QtGui.QApplication.UnicodeUTF8))
         self.label_3.setText(QtGui.QApplication.translate("postprocessing", "Action", None, QtGui.QApplication.UnicodeUTF8))
         self.pushButton_plot.setText(QtGui.QApplication.translate("postprocessing", "Plot", None, QtGui.QApplication.UnicodeUTF8))
         self.pushButton_delete.setText(QtGui.QApplication.translate("postprocessing", "Delete", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/pylot/core/active/gui/vtk_tools_layout.py b/pylot/core/active/gui/vtk_tools_layout.py
index 0c68f3c1..53d05106 100644
--- a/pylot/core/active/gui/vtk_tools_layout.py
+++ b/pylot/core/active/gui/vtk_tools_layout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'vtk_tools_layout.ui'
 #
-# Created: Wed Aug 24 14:38:13 2016
+# Created: Mon Aug 29 10:26:23 2016
 #      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!