diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 4f22334d..1c170cec 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -3180,7 +3180,7 @@ class App(QtCore.QObject):
     def final_save(self):
 
         if self.save_in_progress:
-            self.inform.emit(_("Application is saving the project. Please wait ..."))
+            self.inform.emit(_("[WARNING_NOTCL] Application is saving the project. Please wait ..."))
             return
 
         if self.should_we_save and self.collection.get_list():
@@ -7897,8 +7897,6 @@ The normal flow when working in FlatCAM is the following:</span></p>
         """
         self.log.debug("save_project()")
 
-        self.save_in_progress = True
-
         with self.proc_container.new(_("Saving FlatCAM Project")) as proc:
             ## Capture the latest changes
             # Current object
@@ -7958,6 +7956,7 @@ The normal flow when working in FlatCAM is the following:</span></p>
             if quit:
                 # t = threading.Thread(target=lambda: self.check_project_file_size(1, filename=filename))
                 # t.start()
+                self.save_in_progress = True
                 self.start_delayed_quit(delay=500, filename=filename)
 
     def start_delayed_quit(self, delay, filename):
diff --git a/README.md b/README.md
index 92e17cee..e9e78059 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
 6.04.2019
 
 - fixed bug in Geometry Editor in buffer_int() function that created an Circular Reference Error when applying buffer interior on a geometry.
+- fixed issue with not possible to close the app after a project save.
 
 5.04.2019
 
diff --git a/flatcamEditors/FlatCAMExcEditor.py b/flatcamEditors/FlatCAMExcEditor.py
index e724c6be..9a793a29 100644
--- a/flatcamEditors/FlatCAMExcEditor.py
+++ b/flatcamEditors/FlatCAMExcEditor.py
@@ -2371,7 +2371,6 @@ class FlatCAMExcEditor(QtCore.QObject):
 
         ## Non-iterable
         except TypeError:
-
             ## DrawToolShape
             if isinstance(geometry, DrawToolShape):
                 plot_elements += self.plot_shape(geometry=geometry.geo, color=color, linewidth=linewidth)