diff --git a/behavior.el b/behavior.el
index 9d9d364..45eaecc 100644
--- a/behavior.el
+++ b/behavior.el
@@ -1,6 +1,11 @@
 ;; Default tab-width of 2 spaces
 (setq-default tab-width 2)
 
+;; Electric behavior
+(electric-pair-mode t)
+(electric-indent-mode t)
+(electric-layout-mode t)
+
 ;; Always indent with spaces
 (setq-default indent-tabs-mode nil)
 
diff --git a/packages.el b/packages.el
index a07ef6e..22bdabe 100644
--- a/packages.el
+++ b/packages.el
@@ -115,7 +115,6 @@
       (append
        '(auto-complete
          auto-complete-emacs-lisp
-         autopair
          coffee-mode
          color-theme-tomorrow
          ecb