diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 3674054..781fa7f 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -347,6 +347,8 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
 
 (with-eval-after-load 'org (load "oni-org-init"))
 
+(with-eval-after-load 'elec-pair (load "oni-elec-pair-init"))
+
 (add-to-list 'grep-files-aliases '("js" . "*.js *.jsx *.json"))
 (add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss"))
 (add-to-list 'grep-files-aliases '("php" . "*.php *.inc *.module"))
diff --git a/emacs/.emacs.d/init/oni-elec-pair-init.el b/emacs/.emacs.d/init/oni-elec-pair-init.el
new file mode 100644
index 0000000..6874d10
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-elec-pair-init.el
@@ -0,0 +1,30 @@
+;;; oni-elec-pair-init.el --- Electric pair config   -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; My configuration for `electric-pair-mode' and friends.
+
+;;; Code:
+
+(setq electric-pair-skip-whitespace 'chomp)
+
+(provide 'oni-elec-pair-init)
+;;; oni-elec-pair-init.el ends here