diff --git a/init.el b/init.el
index f620a9b..052e3be 100644
--- a/init.el
+++ b/init.el
@@ -235,11 +235,13 @@
 
 (use-package puni
   :ensure t
-  :hook ((prog-mode
-          sgml-mode
-          nxml-mode
-          tex-mode
-          eval-expression-minibuffer-setup) . puni-mode)
+  :hook (((prog-mode
+           sgml-mode
+           nxml-mode
+           tex-mode
+           eval-expression-minibuffer-setup)
+          . puni-mode)
+         (puni-mode . electric-pair-mode))
   :bind (:map puni-mode-map
               ("C-c p q" . puni-squeeze)
               ("C-c p b" . puni-barf-forward)
@@ -253,10 +255,10 @@
               ("C-c p L" . puni-split)
               ("C-c p m" . puni-mark-sexp-around-point)
               ("C-c p =" . puni-expand-region)
-              ("C-c p w (" . puni-wrap-round)
-              ("C-c p w [" . puni-wrap-square)
-              ("C-c p w {" . puni-wrap-curly)
-              ("C-c p w <" . puni-wrap-angle)
+              ("C-c p r (" . puni-wrap-round)
+              ("C-c p r [" . puni-wrap-square)
+              ("C-c p r {" . puni-wrap-curly)
+              ("C-c p r <" . puni-wrap-angle)
               ("C-c p k i" . puni-change-inner)
               ("C-c p k o" . puni-change-outer)
               ("C-c p w i" . puni-copy-inner)