diff --git a/modules/lang/clojure/autoload.el b/modules/lang/clojure/autoload.el
index a85730cbd..f583821de 100644
--- a/modules/lang/clojure/autoload.el
+++ b/modules/lang/clojure/autoload.el
@@ -16,8 +16,7 @@ at point."
 (defun +clojure/open-repl (&optional arg)
   "Open a Cider REPL and return the buffer."
   (interactive "P")
-  (cider-jack-in arg)
-  (current-buffer))
+  (process-buffer (cider-jack-in arg)))
 
 ;;;###autoload
 (defun +clojure/cider-switch-to-repl-buffer-and-switch-ns ()
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index da45ba66f..1d809d6f9 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -1,10 +1,7 @@
 ;;; lang/clojure/config.el -*- lexical-binding: t; -*-
 
-(after! clojure-mode
-  (add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
-
-  (set-repl-handler! 'clojure-mode #'+clojure/open-repl)
-  (set-eval-handler! 'clojure-mode #'cider-eval-region))
+;;;###package clojure-mode
+(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
 
 
 (use-package! cider
@@ -12,6 +9,10 @@
   ;; cider jack in won't work.
   :commands cider-jack-in cider-jack-in-clojurescript
   :hook (clojure-mode-local-vars . cider-mode)
+  :init
+  (after! clojure-mode
+    (set-repl-handler! 'clojure-mode #'+clojure/open-repl)
+    (set-eval-handler! 'clojure-mode #'cider-eval-region))
   :config
   (add-hook 'cider-mode-hook #'eldoc-mode)
   (set-lookup-handlers! 'cider-mode