diff --git a/core/core-editor.el b/core/core-editor.el
index 9f1ca8508..f6a94e654 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -142,7 +142,7 @@ enable multiple minor modes for the same regexp.")
 (defvar-local narf-electric-indent-words '())
 (setq electric-indent-chars '(?\n ?\^?))
 (push (lambda (c)
-        (when (eolp)
+        (when (and (eolp) narf-electric-indent-words)
           (save-excursion
             (backward-word)
             (looking-at-p (concat "\\<" (regexp-opt narf-electric-indent-words))))))