diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
index 69ff8282d..69ce17737 100644
--- a/modules/lang/ocaml/config.el
+++ b/modules/lang/ocaml/config.el
@@ -37,7 +37,9 @@
     (set-eval-handler! 'tuareg-mode #'utop-eval-region)
     (defun +ocaml-init-utop-h ()
       (when (executable-find "utop")
-        (utop-minor-mode)))))
+        (utop-minor-mode)))
+    :config
+    (set-popup-rule! "^\\*utop\\*" :quit nil)))
 
 
 (use-package! merlin
diff --git a/modules/lang/scheme/config.el b/modules/lang/scheme/config.el
index 9f4e286a0..67e5bfd6a 100644
--- a/modules/lang/scheme/config.el
+++ b/modules/lang/scheme/config.el
@@ -17,6 +17,9 @@
       :definition #'geiser-edit-symbol-at-point
       :documentation #'geiser-doc-symbol-at-point))
   :config
+  (set-popup-rules!
+    '(("\\*[Gg]eiser \\(?:[Mm]essages\\|DBG\\|Xref\\)\\*" :quit nil)
+      ( "\\* [A-Za-z0-9_-]+ REPL \\*" :quit nil)))
   (map! :localleader
         :map scheme-mode-map
         "'" #'geiser-mode-switch-to-repl