diff --git a/src/shell/shell_misc.cpp b/src/shell/shell_misc.cpp
index 593fdf8c8..e6dbea956 100644
--- a/src/shell/shell_misc.cpp
+++ b/src/shell/shell_misc.cpp
@@ -1064,6 +1064,7 @@ void DOS_Shell::InputCommand(char * line) {
                     && dbcs_sbcs
 #endif
                     && IS_DOS_JAPANESE)) {
+                    if(dos.loaded_codepage == 932 && isKanji1(cr >> 8) && (cr & 0xFF) == 0) break;
                     bool kanji_flag = false;
                     uint16_t pos = str_index;
                     while(1) {