diff --git a/modules/lang/java/autoload.el b/modules/lang/java/autoload.el
index 86e06f26c..f95d128f2 100644
--- a/modules/lang/java/autoload.el
+++ b/modules/lang/java/autoload.el
@@ -71,3 +71,10 @@ root)."
     (user-error "This buffer has no filepath; cannot guess its class name"))
   (or (file-name-sans-extension (file-name-base (buffer-file-name)))
       "ClassName"))
+
+;;;###autoload
+(defun +java/groovy-open-repl ()
+  "Open a Groovy REPL."
+  (interactive)
+  (call-interactively #'run-groovy)
+  (get-buffer groovy-buffer))
diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el
index 5e6dee5fd..f02a82992 100644
--- a/modules/lang/java/config.el
+++ b/modules/lang/java/config.el
@@ -45,4 +45,6 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
 (use-package! groovy-mode
   :mode "\\.g\\(?:radle\\|roovy\\)$"
   :config
-  (set-eval-handler! 'groovy-mode "groovy"))
+  (set-docsets! 'groovy-mode "Groovy" "Groovy_JDK")
+  (set-eval-handler! 'groovy-mode "groovy")
+  (set-repl-handler! 'groovy-mode #'+java/groovy-open-repl))