diff --git a/.emacs.d/lisp/init-lisp.el b/.emacs.d/lisp/init-lisp.el
index 4888bda5..be532ae0 100644
--- a/.emacs.d/lisp/init-lisp.el
+++ b/.emacs.d/lisp/init-lisp.el
@@ -102,12 +102,14 @@
                       "<f6>" (lambda () (interactive) (async-byte-recompile-directory (file-name-directory (buffer-file-name)))))
 
 ;;; Common LISP.
+;; TODO: Somehow this does not work when a EXWM is focused.
 (defun ambrevar/slime-switch-to-repl ()
   (interactive)
   (pcase (length slime-net-processes)
     (0 (slime))
-    (1 (if (eq (current-buffer) (slime-output-buffer))
-           (slime)
+    (1 (if (and (eq (current-buffer) (slime-output-buffer))
+                (require 'helm-slime nil 'no-error))
+           (helm-slime-mini)
          (pop-to-buffer (slime-output-buffer))))
     (_ (if (require 'helm-slime nil 'noerror)
            (helm-slime-mini)