diff --git a/src/cmd.c b/src/cmd.c
index efa0288a6..cd77a6727 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -2299,7 +2299,9 @@ handler_rebind_keys_add(boolean keyfirst)
     char buf2[QBUFSZ];
     uchar key = '\0';
     int clr = NO_COLOR;
+    char cmdstr[BUFSZ];
 
+    cmdstr[0] = '\0';
     if (keyfirst) {
         pline("Bind which key? ");
         key = pgetchar();
@@ -2353,9 +2355,7 @@ handler_rebind_keys_add(boolean keyfirst)
     destroy_nhwindow(win);
     if (npick > 0) {
         struct Cmd_bind *prevcmd;
-        char cmdstr[BUFSZ];
 
-        cmdstr[0] = '\0';
         i = picks->item.a_int;
         free((genericptr_t) picks);