diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69e062d0..b068f6b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,11 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
-2.01.2022
+22.01.2022
 
 - improved the running of scripts when loading from GUI a script as a FlatCAM script
+- fixed the `GRBL_laser` preprocessor such that it does not have a Z move at the end of the job due of the fact that this preprocessor has moves only in the X-Y plane
+- in Milling Plugin made sure the preprocessors that have the `laser_z` in the name (case insensitive) have the ability to change the Z height at the end of the job (through End_Z parameter)
 
 21.01.2022
 
diff --git a/appPlugins/ToolMilling.py b/appPlugins/ToolMilling.py
index 4dc0491d..e4a92c59 100644
--- a/appPlugins/ToolMilling.py
+++ b/appPlugins/ToolMilling.py
@@ -3512,8 +3512,12 @@ class ToolMilling(AppTool, Excellon):
             self.ui.cutzlabel.hide()
             self.ui.cutz_entry.hide()
 
-            self.ui.endz_label.hide()
-            self.ui.endz_entry.hide()
+            if 'laser_z' not in current_pp.lower():
+                self.ui.endz_label.hide()
+                self.ui.endz_entry.hide()
+            else:
+                self.ui.endz_label.show()
+                self.ui.endz_entry.show()
 
             self.ui.travelzlabel.hide()
             self.ui.travelz_entry.hide()
diff --git a/preprocessors/GRBL_laser.py b/preprocessors/GRBL_laser.py
index 487000d4..c7d4f462 100644
--- a/preprocessors/GRBL_laser.py
+++ b/preprocessors/GRBL_laser.py
@@ -95,7 +95,7 @@ class GRBL_laser(PreProc):
 
     def end_code(self, p):
         coords_xy = p['xy_end']
-        gcode = ('G0 Z' + self.feedrate_format % (p.fr_decimals, p.z_end) + "\n")
+        gcode = ''
 
         if coords_xy and coords_xy != '':
             gcode += 'G0 X{x} Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n"