diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 4aa08785c..23782811f 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1964,6 +1964,9 @@ restoring a save file could trigger impossible "rnd(0) attempted" if it tried
 fix regression of a post-3.6 fix:  if 2 Wizards of Yendor were in play and 1
 	escaped the dungeon, bookkeeping for current number of Wizards stayed
 	at 2, interferring with future Wizard behavior
+sometimes a repeat count from the preceding command carried over to most
+	recent one when using do-again (^A); if the most recent one was an
+	extended command, the spurious repeat was for '#'
 
 
 Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository
diff --git a/src/cmd.c b/src/cmd.c
index 5fae80123..ae3b325ae 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -4743,8 +4743,8 @@ parse(void)
 
         foo = get_count((char *) 0, '\0', LARGEST_INT,
                         &gc.command_count, GC_NOFLAGS);
-        gl.last_command_count = gc.command_count;
     }
+    gl.last_command_count = gc.command_count;
 
     if (foo == gc.Cmd.spkeys[NHKF_ESC]) { /* esc cancels count (TH) */
         clear_nhwindow(WIN_MESSAGE);