diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 76c45d541..7e4cca1b4 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -83,8 +83,7 @@ object Defaults extends BuildCommon
 		watchingMessage := Watched.defaultWatchingMessage,
 		triggeredMessage := Watched.defaultTriggeredMessage,
 		definesClass :== FileValueCache(Locate.definesClass _ ).get,
-		trapExit :== false,
-		trapExit in run :== true,
+		trapExit :== true,
 		traceLevel in run :== 0,
 		traceLevel in runMain :== 0,
 		traceLevel in console :== Int.MaxValue,