diff --git a/content/liberator.js b/content/liberator.js
index a87651b5..2486537b 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -888,8 +888,6 @@ const liberator = (function () //{{{
         // quit liberator, no matter how many tabs/windows are open
         quit: function (saveSession)
         {
-            liberator.autocommands.trigger("Quit", "");
-
             if (saveSession)
                 liberator.options.setPref("browser.startup.page", 3); // start with saved session
             else
@@ -913,8 +911,6 @@ const liberator = (function () //{{{
             if (cancelQuit.data)
                 return;
 
-            liberator.autocommands.trigger("Quit", "");
-
             // notify all windows that an application quit has been granted.
             os.notifyObservers(null, "quit-application-granted", null);
 
@@ -1038,6 +1034,8 @@ const liberator = (function () //{{{
                 liberator.quickmarks.destroy();
 
             window.dump("All liberator modules destroyed\n");
+
+            liberator.autocommands.trigger("Quit", "");
         },
 
         sleep: function (ms)