diff --git a/tryton/gui/window/win_form.py b/tryton/gui/window/win_form.py
index c0d9b652c9..ae187b527f 100644
--- a/tryton/gui/window/win_form.py
+++ b/tryton/gui/window/win_form.py
@@ -299,7 +299,7 @@ class WinForm(object):
 
         if res == gtk.RESPONSE_OK:
             return True
-        elif self.but_cancel.get_label == gtk.STOCK_CANCEL:
+        elif res == gtk.RESPONSE_CANCEL or res == gtk.RESPONSE_DELETE_EVENT:
             self.screen.remove(delete=True)
         return False