diff --git a/tools/tuhi-kete.py b/tools/tuhi-kete.py
index 2052b40..7083042 100755
--- a/tools/tuhi-kete.py
+++ b/tools/tuhi-kete.py
@@ -402,6 +402,8 @@ class Searcher(Worker):
     def _on_notify_search(self, manager, pspec):
         if not manager.searching:
             logger.info('Search cancelled')
+        else:
+            self.stop()
 
     def _on_unregistered_device(self, manager, device):
         logger.info(f'Unregistered device: {device}')
@@ -454,6 +456,7 @@ class Listener(Worker):
             return
 
         logger.info(f'{device}: Listening stopped')
+        self.stop()
 
     def _on_drawings_available(self, device, pspec):
         self._log_drawings_available(device)