diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index e97953b..5c963f6 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -19,5 +19,8 @@ Changes
 Bug Fixes
 ---------
 
-* Abort sleep in blinkenlights UI led to crash ('abort_signal' not existing),
+* [Blinkenlights UI] Abort sleep led to crash ('abort_signal' not existing),
+  regression from 6.5.0.
+
+* [Blinkenlights UI] Make exit via 'q' key work again cleanly
   regression from 6.5.0.
diff --git a/offlineimap/ui/Curses.py b/offlineimap/ui/Curses.py
index 98055ba..af41d35 100644
--- a/offlineimap/ui/Curses.py
+++ b/offlineimap/ui/Curses.py
@@ -487,11 +487,9 @@ class Blinkenlights(UIBase, CursesUtil):
         if key < 1 or key > 255:
             return
         if chr(key) == 'q':
-            # Request to quit.
-            #TODO: this causes us to bail out in main loop when the thread exits
-            #TODO: review and rework this mechanism.
-            currentThread().set_exit_exception(SystemExit("User requested shutdown"))
-            self.terminate()
+            # Request to quit completely.
+            self.warn("Requested shutdown via 'q'")
+            offlineimap.accounts.Account.set_abort_event(self.config, 3)
         try:
             index = int(chr(key))
         except ValueError: