diff --git a/components/ideintf/ideexterntoolintf.pas b/components/ideintf/ideexterntoolintf.pas
index 3a9c3f425f..28d64b166d 100644
--- a/components/ideintf/ideexterntoolintf.pas
+++ b/components/ideintf/ideexterntoolintf.pas
@@ -34,6 +34,8 @@ const
   SubToolDefault = 'External Tool';
   SubToolDefaultPriority = 0;
 
+  AbortedExitCode = 12321;
+
 type
   TETShareStringEvent = procedure(var s: string) of object;
 
diff --git a/ide/main.pp b/ide/main.pp
index 9dd45ace08..4886395d86 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -7286,7 +7286,10 @@ end;
 function TMainIDE.DoAbortBuild: TModalResult;
 begin
   Result:=mrOk;
+  {$IFDEF EnableNewExtTools}
+  {$ELSE}
   if ToolStatus<>itBuilder then exit;
+  {$ENDIF}
   AbortBuild;
 end;