diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c
index 821ef78d715..8889eca7358 100644
--- a/base/shell/cmd/parser.c
+++ b/base/shell/cmd/parser.c
@@ -547,9 +547,10 @@ error:
 /* Parse a REM command */
 static PARSED_COMMAND *ParseRem(void)
 {
-    /* Just ignore the rest of the line */
-    while (CurChar && CurChar != _T('\n'))
-        ParseChar();
+    /* "Ignore" the rest of the line.
+     * (Line continuations will still be parsed, though.) */
+    while (ParseToken(0, NULL) != TOK_END)
+        ;
     return NULL;
 }