diff --git a/README.md b/README.md
index c579d495..b2255a00 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing.
 
 - added autocomplete finish with ENTER key for the TCL Shell
 - made sure that the autocomplete function works only for FlatCAM Scripts
+- ESC key will trigger normal view if in full screen and the ESC key is pressed
 
 19.03.2019
 
diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py
index d3a36804..26371233 100644
--- a/flatcamGUI/FlatCAMGUI.py
+++ b/flatcamGUI/FlatCAMGUI.py
@@ -1958,6 +1958,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                 # Escape = Deselect All
                 if key == QtCore.Qt.Key_Escape or key == 'Escape':
                     self.app.on_deselect_all()
+
+                    # if in full screen, exit to normal view
+                    self.showNormal()
+                    self.app.restore_toolbar_view()
+                    self.splitter_left.setVisible(True)
+                    self.app.toggle_fscreen = False
+
                     # try to disconnect the slot from Set Origin
                     try:
                         self.app.plotcanvas.vis_disconnect('mouse_press', self.app.on_set_zero_click)