diff --git a/ide/searchfrm.pas b/ide/searchfrm.pas
index 3359a0d7c1..b725f87bfe 100644
--- a/ide/searchfrm.pas
+++ b/ide/searchfrm.pas
@@ -894,7 +894,7 @@ begin
     end;
 
   // Check abort
-  if Progress.Abort then
+  if Application.Terminated or Progress.Abort then
   begin
     FileIterator.Stop;
     FResultsList.Insert(0, FAbortString);