diff --git a/src/Application.vala b/src/Application.vala
index 0987a1034..32ec2afff 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -171,12 +171,6 @@ namespace Maya {
             if (saved_state.get_boolean ("window-maximized")) {
                 window.maximize ();
             }
-
-            window.destroy.connect (on_quit);
-        }
-
-        private void on_quit () {
-            Calendar.EventStore.get_default ().delete_trashed_calendars ();
         }
 
         public async bool ask_for_background () {
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 63f6e8894..128c26557 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -141,6 +141,8 @@ public class Maya.MainWindow : Hdy.ApplicationWindow {
     }
 
     public override bool delete_event (Gdk.EventAny event) {
+        Calendar.EventStore.get_default ().delete_trashed_calendars ();
+
         ((Application) application).ask_for_background.begin ((obj, res) => {
             unowned var app = (Application) obj;
             if (app.ask_for_background.end (res)) {