diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py
index 76457732..1a72d684 100644
--- a/FlatCAMGUI.py
+++ b/FlatCAMGUI.py
@@ -1864,6 +1864,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                 # Escape = Deselect All
                 if key == QtCore.Qt.Key_Escape or key == 'Escape':
                     self.app.on_deselect_all()
+                    # try to disconnect the slot from Set Origin
+                    try:
+                        self.app.plotcanvas.vis_disconnect('mouse_press', self.app.on_set_zero_click)
+                    except:
+                        pass
                     self.app.inform.emit("")
 
                 # Space = Toggle Active/Inactive
diff --git a/FlatCAMObj.py b/FlatCAMObj.py
index e80361f1..9935cb73 100644
--- a/FlatCAMObj.py
+++ b/FlatCAMObj.py
@@ -2288,7 +2288,8 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
             if self.options["solid"]:
                 for tool in self.tools:
                     for geo in self.tools[tool]['solid_geometry']:
-                        self.add_shape(shape=geo, color='#750000BF', face_color='#C40000BF', visible=self.options['plot'],
+                        self.add_shape(shape=geo, color='#750000BF', face_color='#C40000BF',
+                                       visible=self.options['plot'],
                                        layer=2)
             else:
                 for tool in self.tools:
diff --git a/README.md b/README.md
index 8f2f0435..08e08951 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ CAD program, and create G-Code for Isolation routing.
 - when saving a file from Code Editor and there is no object active then the OpenFileDialog filters are reset to FlatConfig files.
 - reverted a change in GCode that might affect Gerber polarity change in Gerber parser
 - ability to double click the FlatConfig files and open them in the FlatCAM Code Editor - fixed and verified
+- fixed the Set To Origin function when Escape was clicked
 
 23.02.2019