diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c76b77f..71e92dc 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -664,6 +664,9 @@ MODE1 is enabled and vice-versa."
 ;; Update diff-hl when magit changes something.
 (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t)
 
+;; Turn on electric-quote mode in git commit buffers
+(add-hook 'git-commit-mode-hook 'electric-quote-local-mode)
+
 (oni:add-hooks 'texinfo-mode-hook
   #'outline-minor-mode)