diff --git a/source/buffer.lisp b/source/buffer.lisp
index 1790b443ca95..e3085b18a871 100644
--- a/source/buffer.lisp
+++ b/source/buffer.lisp
@@ -1313,9 +1313,8 @@ proceeding."
                                              "Set current BUFFER for the active window."
                                              (set-current-buffer buffer :focus nil)))
    (prompter:destructor (let ((buffer (current-buffer)))
-                          (lambda (prompter source)
-                            (declare (ignore source))
-                            (unless (or (prompter:returned-p prompter)
+                          (lambda (source)
+                            (unless (or (prompter:returned-p (prompter:prompter source))
                                         (eq buffer (current-buffer)))
                               (set-current-buffer buffer))))))
   (:export-class-name-p t)