diff --git a/src/macros.c b/src/macros.c
index 64cf5e80c44..f5bddd26e6f 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -51,6 +51,8 @@ int executing_macro_iterations;
 
 Lisp_Object executing_macro;
 
+extern Lisp_Object real_this_command;
+
 Lisp_Object Fexecute_kbd_macro ();
 
 DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 1, "P",
@@ -286,6 +288,8 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
 
   executing_macro = Qnil;
 
+  real_this_command = Vexecuting_macro;
+
   UNGCPRO;
   return unbind_to (pdlcount, Qnil);
 }