diff --git a/install-compiled.sh b/install-compiled.sh
index 933b92a..f562047 100755
--- a/install-compiled.sh
+++ b/install-compiled.sh
@@ -329,6 +329,8 @@ fi
 mkdir -p "$TMP_DIR"
 mkdir -p "$HOME/.local/state/HamPackServer"
 
+trap "echo 'Cleaning up...'; rm -rf '$TMP_DIR'" EXIT
+
 echo "Starting HamPack source builds..."
 process_conf
 
@@ -336,7 +338,4 @@ echo "Updating desktop database..."
 update-desktop-database "$HOME/.local/share/applications/"
 
 echo ""
-echo "Cleaning up..."
-rm -rf "$TMP_DIR"
-
 echo "All done."
\ No newline at end of file