diff --git a/core/core-editor.el b/core/core-editor.el
index b61a249ce..80f7b7507 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -172,6 +172,14 @@ fundamental-mode) for performance sake."
   (sp-local-pair '(xml-mode nxml-mode php-mode) "<!--" "-->"
                  :post-handlers '(("| " "SPC")))
 
+  (sp-local-pair
+   '(js2-mode typescript-mode rjsx-mode rust-mode
+     c-mode c++-mode objc-mode java-mode php-mode
+     css-mode scss-mode less-css-mode stylus-mode)
+   "/*" "*/"
+   :actions '(insert)
+   :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET") ("\n* ||\n*/[i][d-2]" "*")))
+
   (smartparens-global-mode +1))
 
 ;; Branching undo
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index 6c5d6d7d9..9f7479434 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -135,9 +135,6 @@ compilation database is present in the project.")
                    :when '(+cc-sp-point-is-template-p +cc-sp-point-after-include-p)
                    :post-handlers '(("| " "SPC"))))
   (sp-with-modes '(c-mode c++-mode objc-mode java-mode)
-    (sp-local-pair "/*" "*/" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))
-    ;; Doxygen blocks
-    (sp-local-pair "/**" "*/" :post-handlers '(("||\n[i]" "RET") ("||\n[i]" "SPC")))
     (sp-local-pair "/*!" "*/" :post-handlers '(("||\n[i]" "RET") ("[d-1]< | " "SPC")))))
 
 
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 7966f72df..0caa4a554 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -17,11 +17,6 @@
     ;; Other
     :yield "import"))
 
-(after! smartparens
-  (sp-with-modes '(js2-mode typescript-mode rjsx-mode)
-    (sp-local-pair "/**" ""  :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET")))
-    (sp-local-pair "/*" "*/" :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET")))))
-
 
 ;;
 ;; Major modes
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 171775876..48f26a858 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -3,10 +3,6 @@
 ;; An improved newline+continue comment function
 (setq-hook! css-mode comment-indent-function #'+css/comment-indent-new-line)
 
-(after! smartparens
-  (sp-with-modes '(css-mode scss-mode less-css-mode stylus-mode)
-    (sp-local-pair "/*" "*/" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))))
-
 (map! :map* (css-mode-map scss-mode-map less-css-mode-map)
       :localleader
       :n "rb" #'+css/toggle-inline-or-block)