diff --git a/core/core-defuns.el b/core/core-defuns.el
index 69b5ea939..4c3f123ae 100644
--- a/core/core-defuns.el
+++ b/core/core-defuns.el
@@ -241,10 +241,16 @@ key-chord-define."
          ((null evt) (message ""))
          ((and (integerp evt) (or (char-equal evt ?k)
                                   (char-equal evt ?K)))
+
           (if (evil-replace-state-p)
               (evil-replace-backspace)
             (delete-char -1))
           (set-buffer-modified-p modified)
+          (when (and (bound-and-true-p electric-indent-mode)
+                     narf-electric-indent-words
+                     (eolp)
+                     (looking-back (concat "\\<" (regexp-opt narf-electric-indent-words) "\\>")))
+            (indent-according-to-mode))
           (push 'escape unread-command-events))
          (t
           (setq unread-command-events (append unread-command-events (list evt)))))))))