diff --git a/modules/tools/debugger/autoload/debugger.el b/modules/tools/debugger/autoload/debugger.el
index 9d0f061c3..4b93fba57 100644
--- a/modules/tools/debugger/autoload/debugger.el
+++ b/modules/tools/debugger/autoload/debugger.el
@@ -5,7 +5,7 @@
 (defun +debugger-list-for-dap ()
   (when (and (bound-and-true-p lsp-mode)
              (require 'dap-mode nil t)
-             dsp-mode)
+             dap-mode)
     (mapcar #'car dap--debug-template-configurations)))
 
 (defun +debugger-list-for-realgud ()
@@ -48,7 +48,9 @@ for what debugger to use. If the prefix ARG is set, prompt anyway."
         (unless (fboundp debugger)
           (user-error "Couldn't find debugger backend %S" debugger))
         (setq-local +debugger--last debugger)
-        (call-interactively debugger))
+        (if (assoc debugger dap--debug-template-configurations)
+            (dap-debug debugger)
+          (call-interactively debugger)))
     (+debugger/start-last)))
 
 ;;;###autoload