diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index 257b7ebe..aec023bf 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -169,6 +169,7 @@ namespace IDE
 		public bool mDbgDelayedAutocomplete;
 		public bool mDbgTimeAutocomplete;
 		public bool mDbgPerfAutocomplete;
+		public bool mStopPending;
 		public BeefConfig mBeefConfig = new BeefConfig() ~ delete _;
 		public List<String> mDeferredFails = new .() ~ DeleteContainerAndItems!(_);
 		public String mInitialCWD = new .() ~ delete _;
@@ -15171,7 +15172,7 @@ namespace IDE
 			if (mUpdateCnt % 120 == 0)
 				VerifyModifiedBuffers();
 
-			if (!mSettings.mSettingsValid)
+			if (mStopPending)
 				Stop();
 
 			if (mWantShowOutput)
diff --git a/IDE/src/Settings.bf b/IDE/src/Settings.bf
index 0a493071..ec77c818 100644
--- a/IDE/src/Settings.bf
+++ b/IDE/src/Settings.bf
@@ -1359,6 +1359,7 @@ namespace IDE
 #endif
 					if (result == 3) // Abort
 					{
+						gApp.mStopPending = true;
 						mSettingsValid = false;
 						return;
 					}