diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index e08d5fdba..635299225 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -28,6 +28,9 @@
   (set! :electric 'js2-mode :chars '(?\} ?\) ?.) :words '("||" "&&"))
   (set! :xref-backend 'js2-mode 'xref-js2-xref-backend)
 
+  (sp-with-modes '(js2-mode rjsx-mode)
+    (sp-local-pair "/* " " */" :post-handlers '(("| " "SPC"))))
+
   (map! :map js2-mode-map
         :localleader
         :nv ";" 'doom/append-semicolon
diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el
index bab1d370e..736124246 100644
--- a/modules/lang/php/config.el
+++ b/modules/lang/php/config.el
@@ -20,8 +20,7 @@
   (add-hook! php-mode (setq-local sp-max-pair-length 6))
 
   (sp-with-modes '(php-mode)
-    (sp-local-pair "/*"    "*/" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))
-    (sp-local-pair "/**"   "*/" :post-handlers '(("||\n[i]" "RET") ("||\n[i]" "SPC")))
+    (sp-local-pair "/* "    "*/" :post-handlers '(("||\n[i] " "RET") ("| " "SPC")))
     (sp-local-pair "<? "    " ?>")
     (sp-local-pair "<?php " " ?>")
     (sp-local-pair "<?="    " ?>")