diff --git a/src/ui-goodies.lisp b/src/ui-goodies.lisp
index 2b91f36..43f0d35 100644
--- a/src/ui-goodies.lisp
+++ b/src/ui-goodies.lisp
@@ -348,6 +348,12 @@ Metadata includes:
   (push-event (make-instance 'search-next-event
                              :priority +maximum-event-priority+)))
 
+(defmacro close-window-and-return-to-threads (window-to-close)
+  `(progn
+     (win-close ,window-to-close)
+     (setf ,window-to-close nil)
+     (focus-to-thread-window)))
+
 (defun thread-open-selected-message ()
   "Open selected message"
   (let ((new-title-event (make-instance 'program-events:change-window-title-event
@@ -1284,12 +1290,6 @@ It an existing file path is provided the command will refuse to run."
       (win-close focused)
       (focus-to-message-window))))
 
-(defmacro close-window-and-return-to-threads (window-to-close)
-  `(progn
-     (win-close ,window-to-close)
-     (setf ,window-to-close nil)
-     (focus-to-thread-window)))
-
 (defmacro close-window-and-return-to-message (window-to-close)
   (with-gensyms (focused)
     `(let ((,focused (main-window:focused-window *main-window*)))