diff --git a/src/ui-goodies.lisp b/src/ui-goodies.lisp
index 43f0d35..ae134f1 100644
--- a/src/ui-goodies.lisp
+++ b/src/ui-goodies.lisp
@@ -361,6 +361,8 @@ Metadata includes:
                                         :window *message-window*)))
     (push-event new-title-event)
     (with-enqueued-process ()
+      (when (gopher-window:gopher-window-p specials:*gopher-window*)
+        (close-window-and-return-to-threads specials:*gopher-window*))
       (setf (windows:keybindings specials:*message-window*)
             keybindings:*message-keymap*)
       (thread-window:open-message *thread-window*))))