diff --git a/TODO.md b/TODO.md
index 7b167890..4475ae62 100644
--- a/TODO.md
+++ b/TODO.md
@@ -15,6 +15,8 @@ Gaupol 1.0
 * [x] Add support for IBM273, IBM1125, KOI8-T and KZ1048 character
       encodings (whether these are actually available depends on your
       version of Python)
+* [x] Fix Cancel button behaviour when quitting Gaupol by closing the
+      main window and having unsaved changes (#14)
 * [x] Bump GTK+ dependency to 3.12 or greater
 * [x] Add Serbian translation (Miroslav Nikolić)
 * [x] Update French translation (Jean van Kasteel)
diff --git a/gaupol/agents/close.py b/gaupol/agents/close.py
index a3f95095..d4bfbf1a 100644
--- a/gaupol/agents/close.py
+++ b/gaupol/agents/close.py
@@ -169,10 +169,10 @@ def _on_quit_activate(self, *args):
         self.quit()
 
     @aeidon.deco.export
-    @aeidon.deco.silent(gaupol.Default)
     def _on_window_delete_event(self, *args):
         """Quit Gaupol."""
-        self.quit()
+        with aeidon.util.silent(gaupol.Default):
+            self.quit()
         return True
 
     @aeidon.deco.export