diff --git a/bin/mw b/bin/mw
index 610b8c4..651dd90 100755
--- a/bin/mw
+++ b/bin/mw
@@ -316,7 +316,7 @@ synchronize_flags=true
 gpg_path=$GPG"
 	echo "$nmbasic" > "$NOTMUCH_CONFIG" ;}
 
-trap 'echo -e "\033[0m\n"' INT
+trap 'echo -e "\033[0m\n"; exit' STOP INT ABRT KILL
 
 case "$1" in
 	ls) list ;;