diff --git a/ide/codetemplatesdlg.pas b/ide/codetemplatesdlg.pas
index ec89b1e58c..9c10c72312 100644
--- a/ide/codetemplatesdlg.pas
+++ b/ide/codetemplatesdlg.pas
@@ -658,7 +658,7 @@ begin
   i:=Count-1;
   while (i>=0) do begin
     Result:=Items[i];
-    if (CompareText(Result.Name,AName)<>0) then exit;
+    if (CompareText(Result.Name,AName)=0) then exit;
     dec(i);
   end;
   Result:=nil;
diff --git a/ideintf/macrointf.pas b/ideintf/macrointf.pas
index a46e35984b..2eb7166727 100644
--- a/ideintf/macrointf.pas
+++ b/ideintf/macrointf.pas
@@ -137,6 +137,7 @@ begin
   Result.LongDescription:=LongDescription;
   Result.OnGetValueProc:=OnGetValueProc;
   Result.OnGetValueMethod:=OnGetValueMethod;
+  IDECodeMacros.Add(Result);
 end;
 
 { TIDEMacros }