diff --git a/osdep/getch2.c b/osdep/getch2.c
index e2ff398560..c19a410252 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -385,11 +385,11 @@ bool getch2(struct input_ctx *input_ctx)
 
                 if (utf8_len > 1) {
                     state = STATE_UTF8;
-                    continue;
-                } else if (utf8_len == 1)
+                } else if (utf8_len == 1) {
                     mp_input_put_key(input_ctx, c);
-
-                walk_buf(1);
+                    walk_buf(1);
+                } else
+                    walk_buf(getch2_pos);
 
                 break;
             }