1 files changed, 8 insertions, 1 deletions
diff --git a/crocoite/controller.py b/crocoite/controller.py
index 4d95b09..5f4fe10 100644
--- a/crocoite/controller.py
+++ b/crocoite/controller.py
@@ -178,7 +178,14 @@ class SinglePageController:
             idleTimeout = None
             while True:
                 idleProc = asyncio.ensure_future (l.idle.wait ())
-                finished, pending = await asyncio.wait([idleProc, timeoutProc], return_when=asyncio.FIRST_COMPLETED, timeout=idleTimeout)
+                try:
+                    finished, pending = await asyncio.wait([idleProc, timeoutProc],
+                            return_when=asyncio.FIRST_COMPLETED, timeout=idleTimeout)
+                except asyncio.CancelledError:
+                    idleProc.cancel ()
+                    timeoutProc.cancel ()
+                    break
+
                 if not finished:
                     # idle timeout
                     idleProc.cancel ()