diff --git a/modules/lang/scheme/config.el b/modules/lang/scheme/config.el
index 8fbceb2c1..03641843f 100644
--- a/modules/lang/scheme/config.el
+++ b/modules/lang/scheme/config.el
@@ -40,4 +40,6 @@
           "r" #'geiser-restart-repl
           "R" #'geiser-reload
           "c" #'geiser-repl-clear-buffer))
-  (set-popup-rule! "\\* [A-Za-z0-9_-]+ REPL \\*" :quit nil))
+  (set-popup-rule!
+    '(("\\*[Gg]eiser \\(?:[Mm]essages\\|DBG\\|Xref\\)\\*" :quit nil)
+      ( "\\* [A-Za-z0-9_-]+ REPL \\*" :quit nil))))