diff --git a/core/autoload/editor.el b/core/autoload/editor.el
index 5fe041437..90c8d4b3b 100644
--- a/core/autoload/editor.el
+++ b/core/autoload/editor.el
@@ -270,17 +270,6 @@ Respects `require-final-newline'."
   (when (looking-at "\n+")
     (replace-match "")))
 
-;;;###autoload
-(defun doom/toggle-comment-region-or-line ()
-  "Comments or uncomments the whole region or if no region is
-selected, then the current line."
-  (interactive)
-  (let (beg end)
-    (if (region-active-p)
-        (setq beg (region-beginning) end (region-end))
-      (setq beg (line-beginning-position) end (line-end-position)))
-    (comment-or-uncomment-region beg end)))
-
 ;;;###autoload
 (defun doom/dos2unix ()
   "Convert the current buffer to a Unix file encoding."
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index b562f8768..8b8946860 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -167,7 +167,9 @@
         "s--" #'text-scale-decrease
         ;; Conventional text-editing keys & motions
         "s-a" #'mark-whole-buffer
-        "s-/" #'doom/toggle-comment-region-or-line
+        :g "s-/" (λ! (save-excursion (comment-line 1)))
+        :n "s-/" #'evil-commentary-line
+        :v "s-/" #'evil-commentary
         :gni [s-return]    #'+default/newline-below
         :gni [s-S-return]  #'+default/newline-above
         :gi  [s-backspace] #'doom/backward-kill-to-bol-and-indent