diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index e3b1cd3483..ddf4db221b 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -1817,13 +1817,13 @@ begin
   end;
 
   if Config.Undefines<>nil then begin
-    Node:=Config.Defines.Tree.FindLowest;
+    Node:=Config.Undefines.Tree.FindLowest;
     while Node<>nil do begin
       StrItem:=PStringToStringTreeItem(Node.Data);
       NewDefTempl:=TDefineTemplate.Create('Undefine '+StrItem^.Name,
            'Macro',StrItem^.Name,'',da_UndefineRecurse);
       Result.AddChild(NewDefTempl);
-      Node:=Config.Defines.Tree.FindSuccessor(Node);
+      Node:=Config.Undefines.Tree.FindSuccessor(Node);
     end;
   end;