diff --git a/core/core-editor.el b/core/core-editor.el
index 3142fe157..7e6287bf3 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -29,6 +29,9 @@
     (sp-with-modes '(json-mode js2-mode ruby-mode enh-ruby-mode python-mode)
       (sp-local-pair "[" nil :post-handlers '(("||\n[i]" "RET"))))
 
+    ;; Let web-mode handle autopairing
+    (sp-local-pair 'web-mode "<" nil :actions nil)
+
     (after "yasnippet"
       (defadvice yas-expand (before advice-for-yas-expand activate)
         (sp-remove-active-pair-overlay)))))