diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5131fa112a7..d89818e836e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* electric.el (electric-indent-post-self-insert-function): Check that
+	electric-indent-mode is enabled in current buffer.
+
 2012-04-19  Juanma Barranquero  <lekktu@gmail.com>
 
 	* imenu.el (imenu-progress-message): Restore; it is "used" in
diff --git a/lisp/electric.el b/lisp/electric.el
index 50c9010a74e..6a31ba1f1d3 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -215,6 +215,7 @@ point right after that char, and it should return t to cause indentation,
   ;; it looks challenging.
   (let (pos)
     (when (and
+           electric-indent-mode
            ;; Don't reindent while inserting spaces at beginning of line.
            (or (not (memq last-command-event '(?\s ?\t)))
                (save-excursion (skip-chars-backward " \t") (not (bolp))))