diff --git a/core/core-editor.el b/core/core-editor.el
index 1f2eb1a9a..64f60d72e 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -30,10 +30,12 @@
     (sp-with-modes '(json-mode js2-mode ruby-mode enh-ruby-mode python-mode)
       (sp-local-pair "[" nil :post-handlers '(("||\n[i]" "RET"))))
 
+    (sp-with-modes '(java-mode c++-mode c-mode)
+      (sp-local-pair "/**" "*/" :post-handlers '(("* ||\n[i]" "RET"))))
+
     (after "yasnippet"
       (defadvice yas-expand (before advice-for-yas-expand activate)
         (sp-remove-active-pair-overlay)))))
 
-
 (provide 'core-editor)
 ;;; core-editor.el ends here
diff --git a/init/init-java.el b/init/init-java.el
index e719e6ea3..1c9087606 100644
--- a/init/init-java.el
+++ b/init/init-java.el
@@ -34,9 +34,5 @@
   :mode "\\.gradle$"
   :config (after "auto-complete" (add-to-list 'ac-modes 'groovy-mode)))
 
-(sp-with-modes '(java-mode)
-    (sp-local-pair "/**" "*/" :post-handlers '(("* ||\n[i]" "RET"))))
-
-
 (provide 'init-java)
 ;;; init-java.el ends here