diff --git a/src/Mod/Path/PathScripts/PathToolController.py b/src/Mod/Path/PathScripts/PathToolController.py
index c0c543ba42..4e29a098af 100644
--- a/src/Mod/Path/PathScripts/PathToolController.py
+++ b/src/Mod/Path/PathScripts/PathToolController.py
@@ -131,9 +131,9 @@ class ToolController:
         # Enumeration lists for App::PropertyEnumeration properties
         enums = {
             "SpindleDir": [
-                (translate("Path_ToolController", "None"), "None"),
                 (translate("Path_ToolController", "Forward"), "Forward"),
                 (translate("Path_ToolController", "Reverse"), "Reverse"),
+                (translate("Path_ToolController", "None"), "None"),
             ],  # this is the direction that the profile runs
         }
 
@@ -276,6 +276,7 @@ class ToolController:
                     args["spindledirection"] = SpindleDirection.CW
                 else:
                     args["spindledirection"] = SpindleDirection.CCW
+
         elif obj.SpindleDir == "None":
             args["spindledirection"] = SpindleDirection.OFF
         else:
@@ -366,6 +367,10 @@ def Create(
                 if tool.ViewObject:
                     tool.ViewObject.Visibility = False
         obj.Tool = tool
+
+        if hasattr(obj.Tool, "SpindleDirection"):
+            obj.SpindleDir = obj.Tool.SpindleDirection
+
     obj.ToolNumber = toolNumber
     return obj
 
diff --git a/src/Mod/Path/Tools/Shape/endmill.fcstd b/src/Mod/Path/Tools/Shape/endmill.fcstd
index e1108fb97a..2373458a7c 100644
Binary files a/src/Mod/Path/Tools/Shape/endmill.fcstd and b/src/Mod/Path/Tools/Shape/endmill.fcstd differ