1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/acdw-circe.el b/lisp/acdw-circe.el
index 958ef38..a45c6ff 100644
--- a/lisp/acdw-circe.el
+++ b/lisp/acdw-circe.el

@@ -17,7 +17,10 @@ message the current topic."
  (interactive "p")
  (let ((topic
         (save-excursion
-           (re-search-backward (rx "*** Topic for #" (+ (or word "-")) ": "))
+           (goto-char (point-max))
+           (or (re-search-backward (rx "*** Topic change" (+ (not ":")) ": "))
+               (re-search-backward
+                (rx "*** Topic for #" (+ (or word "-")) ": ")))
           (buffer-substring-no-properties
            (match-end 0) (line-end-position)))))
    (when message