diff --git a/src/apps/terminal/TermParse.cpp b/src/apps/terminal/TermParse.cpp
index 2a0f609c67..7197ab2435 100644
--- a/src/apps/terminal/TermParse.cpp
+++ b/src/apps/terminal/TermParse.cpp
@@ -69,6 +69,10 @@ TermParse::_NextParseChar()
 			throw error;
 	}
 
+#ifdef USE_DEBUG_SNAPSHOTS
+	fBuffer->CaptureChar(fParserBuffer[fParserBufferOffset]);
+#endif
+
 	return fParserBuffer[fParserBufferOffset++];
 }
 
@@ -410,10 +414,6 @@ TermParse::EscParse()
 
 	//debug_printf("TermParse: char: '%c' (%d), parse state: %d\n", c, c, parsestate[c]);
 
-#ifdef USE_DEBUG_SNAPSHOTS
-			fBuffer->CaptureChar(c);
-#endif
-
 			switch (parsestate[c]) {
 				case CASE_PRINT:
 					fBuffer->InsertChar((char)c);