diff --git a/modules/feature/eval/autoload/repl.el b/modules/feature/eval/autoload/repl.el
index d265f92fe..9e19288ee 100644
--- a/modules/feature/eval/autoload/repl.el
+++ b/modules/feature/eval/autoload/repl.el
@@ -18,7 +18,8 @@
           (setq +eval-repl-buffer repl-buffer)
           (select-window (doom-popup-buffer repl-buffer)))))
     (when (eq (current-buffer) +eval-repl-buffer)
-      (goto-char (if (derived-mode-p 'comint-mode)
+      (goto-char (if (and (derived-mode-p 'comint-mode)
+                          (cdr comint-last-prompt))
                      (cdr comint-last-prompt)
                    (point-max)))
       t)))