diff --git a/notestorm b/notestorm
index e4970e6..465deee 100755
--- a/notestorm
+++ b/notestorm
@@ -339,7 +339,7 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-trap cleanup EXIT
+trap cleanup SIGINT SIGTERM EXIT
 
 # If there were args, the program was controled by those and we do not need the menu.
 if [ $argNum -gt 0 ]; then