diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index 854b750d2..0b17bfb14 100644
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -62,7 +62,8 @@ Settings =
     (if sectionToOpen then sectionToOpen else links[0]).click() unless openSection is 'none'
 
     $.on $('.close', dialog), 'click', Settings.close
-    $.on overlay,             'click', Settings.close
+    $.on overlay, 'click', Settings.close
+    $.on window, 'beforeunload', Settings.close
 
     $.add d.body, [overlay, dialog]