diff --git a/src/util.py b/src/util.py
--- a/src/util.py
+++ b/src/util.py
@@ -31,7 +31,9 @@ class MsgQueue:
 			if self._queue.empty():
 				self._event.clear()
 			log.info(msg)
-			if msg[0]=="!kill": break
+			if msg[0]=="!kill":
+				self._queue.cancel_join_thread()
+				break
 			self._handleEvent(msg)
 
 	def setHandler(self,handler):