1 files changed, 2 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 2ccf444964b..135c3313a7b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1494,7 +1494,7 @@ command_loop_1 ()
          Is this a good idea?  */
       if (FRAMEP (internal_last_event_frame)
           && !EQ (internal_last_event_frame, selected_frame))
-        Fselect_frame (internal_last_event_frame, Qnil);
+        Fselect_frame (internal_last_event_frame);
 #endif
       /* If it has changed current-menubar from previous value,
          really recompute the menubar from the value.  */
@@ -1507,6 +1507,7 @@ command_loop_1 ()
 
       Vthis_command = Qnil;
       real_this_command = Qnil;
+      Vthis_original_command = Qnil;
 
       /* Read next key sequence; i gets its length.  */
       i = read_key_sequence (keybuf, sizeof keybuf / sizeof keybuf[0],