diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index b0c4c8513a..2e19fbcafe 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -1237,6 +1237,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         return True
 
     def shutdown(self, write_settings=True):
+        timed_print('Shutdown starting...')
         self.shutting_down = True
         if hasattr(self.library_view, 'connect_to_book_display_timer'):
             self.library_view.connect_to_book_display_timer.stop()
@@ -1322,11 +1323,12 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         self.istores.join()
         wait_for_cleanup()
         wait_for_stop()
+        self.shutdown_completed.emit()
+        timed_print('Shutdown complete, quitting...')
         try:
             sys.stdout.flush()  # Make sure any buffered prints are written for debug mode
         except Exception:
             pass
-        self.shutdown_completed.emit()
         return True
 
     def run_wizard(self, *args):