diff --git a/key-string.c b/key-string.c
index 81d014ac..ad7cbf50 100644
--- a/key-string.c
+++ b/key-string.c
@@ -176,6 +176,7 @@ key_string_lookup_string(const char *string)
 		if (utf8_open(&ud, (u_char)*string)) {
 			if (strlen(string) != ud.size)
 				return (KEYC_NONE);
+			more = 1;
 			for (i = 1; i < ud.size; i++)
 				more = utf8_append(&ud, (u_char)string[i]);
 			if (more != 0)
diff --git a/tty-keys.c b/tty-keys.c
index 4bdc061a..cc6b934a 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -546,6 +546,7 @@ first_key:
 				goto discard_key;
 			goto partial_key;
 		}
+		more = 1;
 		for (i = 1; i < size; i++)
 			more = utf8_append(&ud, (u_char)buf[i]);
 		if (more != 0)