diff --git a/modules/feature/eval/autoload/repl.el b/modules/feature/eval/autoload/repl.el
index 437e73a4e..dcd8df1a1 100644
--- a/modules/feature/eval/autoload/repl.el
+++ b/modules/feature/eval/autoload/repl.el
@@ -18,7 +18,11 @@
       (funcall (if same-window-p #'switch-to-buffer #'pop-to-buffer)
                (if (buffer-live-p buffer)
                    buffer
-                 (setq buffer (save-window-excursion (call-interactively command)))
+                 (setq buffer
+                       (save-window-excursion
+                         (if (commandp command)
+                             (call-interactively command)
+                           (funcall command))))
                  (unless (bufferp buffer)
                    (error "REPL command didn't return a buffer"))
                  (with-current-buffer buffer (+eval-repl-mode +1))