diff --git a/src/Mod/CAM/Path/Op/Base.py b/src/Mod/CAM/Path/Op/Base.py
index 0961f80c8b..513d1b97a2 100644
--- a/src/Mod/CAM/Path/Op/Base.py
+++ b/src/Mod/CAM/Path/Op/Base.py
@@ -552,8 +552,10 @@ class ObjectOp(object):
         features = self.opFeatures(obj)
 
         if FeatureTool & features:
-            if 1 < len(job.Operations.Group):
-                obj.ToolController = PathUtil.toolControllerForOp(job.Operations.Group[-2])
+            for op in job.Operations.Group[-2::-1]:
+                obj.ToolController = PathUtil.toolControllerForOp(op)
+                if obj.ToolController:
+                    break
             else:
                 obj.ToolController = PathUtils.findToolController(obj, self)
             if not obj.ToolController: